Individual and Jwellery Account Setup done

kifi-api/src/main/java/com/kifi/api/controller/SetupController.java

@@ -33,7 +33,7 @@ public class SetupController {
     @PostMapping("/setup")
     public Mono<ResponseEntity<Map<String, String>>> completeSetup(Authentication authentication, @RequestBody SetupRequestDTO request, org.springframework.web.server.ServerWebExchange exchange) {
         Long userId = Long.valueOf(authentication.getDetails().toString());
-        String userAgent = exchange.getRequest().getHeaders().getFirst("User-Agent");
+        String userAgent = exchange.getRequest().getHeaders().getFirst(org.springframework.http.HttpHeaders.USER_AGENT);
         String ipAddress = exchange.getRequest().getHeaders().getFirst("X-Forwarded-For");
         if (ipAddress == null && exchange.getRequest().getRemoteAddress() != null) {
             ipAddress = exchange.getRequest().getRemoteAddress().getAddress().getHostAddress();

kifi-api/src/main/java/com/kifi/api/controller/inventory/CommodityRateController.java

@@ -0,0 +1,43 @@
+package com.kifi.api.controller.inventory;
+
+import com.kifi.api.entity.inventory.CommodityRateHistory;
+import com.kifi.api.service.inventory.CommodityRateService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.Authentication;
+import org.springframework.web.bind.annotation.*;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+@RestController
+@RequestMapping("/api/kifi-v2/inventory/commodity-rates")
+@RequiredArgsConstructor
+public class CommodityRateController {
+    private final CommodityRateService rateService;
+
+    @GetMapping("/{commodityName}")
+    public Flux<CommodityRateHistory> getRateHistory(@PathVariable String commodityName) {
+        return rateService.getRateHistory(commodityName);
+    }
+
+    @GetMapping("/{commodityName}/latest")
+    public Mono<ResponseEntity<CommodityRateHistory>> getLatestRate(@PathVariable String commodityName) {
+        return rateService.getLatestRate(commodityName)
+                .map(ResponseEntity::ok)
+                .defaultIfEmpty(ResponseEntity.notFound().build());
+    }
+
+    @PostMapping
+    public Mono<ResponseEntity<CommodityRateHistory>> addRate(
+            Authentication authentication,
+            @RequestBody CommodityRateHistory rateHistory) {
+        Long userId = Long.valueOf(authentication.getDetails().toString());
+        return rateService.addRate(
+                rateHistory.getCommodityName(),
+                rateHistory.getPurity(),
+                rateHistory.getRate(),
+                rateHistory.getSource() != null ? rateHistory.getSource() : "MANUAL",
+                userId
+        ).map(ResponseEntity::ok);
+    }
+}

kifi-api/src/main/java/com/kifi/api/controller/inventory/InventoryItemController.java

@@ -0,0 +1,53 @@
+package com.kifi.api.controller.inventory;
+
+import com.kifi.api.entity.inventory.InventoryItem;
+import com.kifi.api.service.inventory.InventoryItemService;
+import com.kifi.api.service.inventory.InventoryValuationService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.Authentication;
+import java.math.BigDecimal;
+import org.springframework.web.bind.annotation.*;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+@RestController
+@RequestMapping("/api/kifi-v2/inventory/items")
+@RequiredArgsConstructor
+public class InventoryItemController {
+    private final InventoryItemService inventoryItemService;
+    private final InventoryValuationService inventoryValuationService;
+
+    @GetMapping
+    public Flux<InventoryItem> getItems(Authentication authentication) {
+        Long userId = Long.valueOf(authentication.getDetails().toString());
+        return inventoryItemService.getItemsByUserId(userId);
+    }
+
+    @GetMapping("/total-value")
+    public Mono<ResponseEntity<BigDecimal>> getTotalInventoryValue(Authentication authentication) {
+        Long userId = Long.valueOf(authentication.getDetails().toString());
+        return inventoryValuationService.calculateTotalInventoryValue(userId)
+                .map(ResponseEntity::ok);
+    }
+
+    @PostMapping
+    public Mono<ResponseEntity<InventoryItem>> createItem(
+            Authentication authentication,
+            @RequestBody InventoryItem item) {
+        Long userId = Long.valueOf(authentication.getDetails().toString());
+        return inventoryItemService.createItem(userId, item)
+                .map(ResponseEntity::ok);
+    }
+
+    @PutMapping("/{id}")
+    public Mono<ResponseEntity<InventoryItem>> updateItem(
+            Authentication authentication,
+            @PathVariable Long id,
+            @RequestBody InventoryItem item) {
+        Long userId = Long.valueOf(authentication.getDetails().toString());
+        return inventoryItemService.updateItem(userId, id, item)
+                .map(ResponseEntity::ok)
+                .defaultIfEmpty(ResponseEntity.notFound().build());
+    }
+}

kifi-api/src/main/java/com/kifi/api/controller/inventory/ProductCategoryController.java

@@ -2,8 +2,7 @@ package com.kifi.api.controller.inventory;
 
 import com.kifi.api.entity.inventory.ProductCategory;
 import com.kifi.api.repository.inventory.ProductCategoryRepository;
-import com.kifi.api.entity.inventory.CategoryRateHistory;
+// Removed CategoryRateHistory
-import com.kifi.api.repository.inventory.CategoryRateHistoryRepository;
 import com.kifi.api.service.inventory.ProductService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
@@ -22,7 +21,7 @@ import java.util.Map;
 @RequiredArgsConstructor
 public class ProductCategoryController {
     private final ProductCategoryRepository categoryRepository;
-    private final CategoryRateHistoryRepository rateHistoryRepository;
+
     private final ProductService productService;
 
     @GetMapping
@@ -44,55 +43,23 @@ public class ProductCategoryController {
     public Mono<ResponseEntity<ProductCategory>> updateCategory(@PathVariable Long id, @RequestBody ProductCategory category) {
         return categoryRepository.findById(id)
                 .flatMap(existing -> {
-                    boolean rateChanged = category.getDailyRate() != null && !category.getDailyRate().equals(existing.getDailyRate());
                     existing.setName(category.getName());
                     existing.setParentCategoryId(category.getParentCategoryId());
-                    existing.setIsCommodity(category.getIsCommodity());
+                    existing.setHasChild(category.getHasChild());
-                    existing.setDailyRate(category.getDailyRate());
+                    existing.setDefaultHsn(category.getDefaultHsn());
+                    existing.setDefaultGst(category.getDefaultGst());
+                    existing.setHuidRequired(category.getHuidRequired());
+                    existing.setDefaultMakingCharge(category.getDefaultMakingCharge());
+                    existing.setMakingChargeType(category.getMakingChargeType());
+                    existing.setCalculationMethod(category.getCalculationMethod());
+                    existing.setBaseUnit(category.getBaseUnit());
+                    existing.setIsActive(category.getIsActive());
+                    existing.setSortOrder(category.getSortOrder());
                     
-                    Mono<ProductCategory> saveMono = categoryRepository.save(existing);
+                    return categoryRepository.save(existing);
-                    
-                    if (rateChanged && category.getDailyRate() != null) {
-                        return saveMono.flatMap(saved -> 
-                            rateHistoryRepository.findByCategoryIdAndDate(id, LocalDate.now())
-                                .defaultIfEmpty(CategoryRateHistory.builder()
-                                    .categoryId(id)
-                                    .date(LocalDate.now())
-                                    .createdAt(LocalDateTime.now())
-                                    .build())
-                                .flatMap(history -> {
-                                    history.setRate(BigDecimal.valueOf(category.getDailyRate()));
-                                    history.setUpdatedAt(LocalDateTime.now());
-                                    return rateHistoryRepository.save(history);
-                                })
-                                .thenReturn(saved)
-                        );
-                    }
-                    return saveMono;
                 })
                 .map(ResponseEntity::ok)
                 .defaultIfEmpty(ResponseEntity.notFound().build());
     }
 
-    @GetMapping("/{id}/rate-history")
-    public Flux<CategoryRateHistory> getRateHistory(@PathVariable Long id) {
-        return rateHistoryRepository.findRecentHistoryByCategoryId(id);
-    }
-
-    @PostMapping("/{id}/sync-rates")
-    public Mono<ResponseEntity<Map<String, Object>>> syncRates(@PathVariable Long id) {
-        return categoryRepository.findById(id)
-                .flatMap(category -> 
-                    productService.syncCategoryRates(id, category.getDailyRate())
-                        .count()
-                        .map(count -> {
-                            Map<String, Object> response = new java.util.HashMap<>();
-                            response.put("success", true);
-                            response.put("syncedCount", count);
-                            response.put("message", "Successfully synced rates for " + count + " products.");
-                            return ResponseEntity.ok(response);
-                        })
-                )
-                .defaultIfEmpty(ResponseEntity.notFound().build());
-    }
 }

kifi-api/src/main/java/com/kifi/api/entity/UserConsent.java

@@ -23,7 +23,9 @@ public class UserConsent {
     @Builder.Default
     private Boolean accepted = true;
     private LocalDateTime acceptedAt;
+    @org.springframework.data.relational.core.mapping.Column("ip_address")
     private String ipAddress;
+    @org.springframework.data.relational.core.mapping.Column("user_agent")
     private String userAgent;
     private LocalDateTime createdAt;
 }

kifi-api/src/main/java/com/kifi/api/entity/inventory/CommodityRateHistory.java

@@ -8,20 +8,21 @@ import org.springframework.data.annotation.Id;
 import org.springframework.data.relational.core.mapping.Table;
 
 import java.math.BigDecimal;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 @Data
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-@Table("category_rate_history")
+@Table("commodity_rate_history")
-public class CategoryRateHistory {
+public class CommodityRateHistory {
     @Id
     private Long id;
-    private Long categoryId;
+    private String commodityName;
+    private String purity;
     private BigDecimal rate;
-    private LocalDate date;
+    private LocalDateTime effectiveAt;
+    private String source;
+    private Long createdBy;
     private LocalDateTime createdAt;
-    private LocalDateTime updatedAt;
 }

kifi-api/src/main/java/com/kifi/api/entity/inventory/InventoryItem.java

@@ -0,0 +1,46 @@
+package com.kifi.api.entity.inventory;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.relational.core.mapping.Table;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Table("inventory_items")
+public class InventoryItem {
+    @Id
+    private Long id;
+    private Long userId;
+    private Long productId;
+    private String tagNumber;
+    private String sku;
+    private String huid;
+    private String purity;
+    private BigDecimal grossWeight;
+    private BigDecimal netWeight;
+    private BigDecimal stoneWeight;
+    private BigDecimal diamondWeight;
+    private BigDecimal fineWeight;
+    private BigDecimal makingCharges;
+    private String makingChargeType;
+    private BigDecimal purchaseCost;
+    private BigDecimal metalCost;
+    private BigDecimal stoneCost;
+    private BigDecimal certificationCost;
+    private BigDecimal tax;
+    private Long vendorId;
+    private Long branchId;
+    private String purchaseRef;
+    @Builder.Default
+    private String status = "AVAILABLE";
+    private LocalDateTime createdAt;
+    private LocalDateTime updatedAt;
+}

kifi-api/src/main/java/com/kifi/api/entity/inventory/Product.java

@@ -36,7 +36,6 @@ public class Product {
     private String color;
     private String size;
     private String priceCalcRule;
-    private Boolean autoCalculatePrice;
     private Double purityFactor;
     private Double makingCharges;
     private String makingChargesType;

kifi-api/src/main/java/com/kifi/api/entity/inventory/ProductCategory.java

@@ -20,9 +20,22 @@ public class ProductCategory {
     private Long userId;
     private String name;
     private Long parentCategoryId;
-    private Boolean isCommodity;
+    @Builder.Default
+    private Boolean hasChild = false;
+    private String defaultHsn;
+    private java.math.BigDecimal defaultGst;
+    @Builder.Default
+    private Boolean huidRequired = false;
+    private Double defaultMakingCharge;
+    private String makingChargeType;
+    
     private String calculationMethod;
     private String baseUnit;
-    private Double dailyRate;
+    
+    @Builder.Default
+    private Boolean isActive = true;
+    @Builder.Default
+    private Integer sortOrder = 0;
+    
     private LocalDateTime createdAt;
 }

kifi-api/src/main/java/com/kifi/api/entity/invoice/InvoiceItem.java

@@ -25,6 +25,9 @@ public class InvoiceItem {
     @Column("product_id")
     private Long productId;
     
+    @Column("inventory_item_id")
+    private Long inventoryItemId;
+    
     @Column("hsn_code")
     private String hsnCode;
     

kifi-api/src/main/java/com/kifi/api/repository/inventory/CategoryRateHistoryRepository.java

@@ -1,16 +0,0 @@
-package com.kifi.api.repository.inventory;
-
-import com.kifi.api.entity.inventory.CategoryRateHistory;
-import org.springframework.data.r2dbc.repository.Query;
-import org.springframework.data.repository.reactive.ReactiveCrudRepository;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-import java.time.LocalDate;
-
-public interface CategoryRateHistoryRepository extends ReactiveCrudRepository<CategoryRateHistory, Long> {
-    Flux<CategoryRateHistory> findByCategoryIdOrderByDateDesc(Long categoryId);
-    Mono<CategoryRateHistory> findByCategoryIdAndDate(Long categoryId, LocalDate date);
-    
-    @Query("SELECT * FROM category_rate_history WHERE category_id = :categoryId ORDER BY date DESC LIMIT 30")
-    Flux<CategoryRateHistory> findRecentHistoryByCategoryId(Long categoryId);
-}

kifi-api/src/main/java/com/kifi/api/repository/inventory/CommodityRateHistoryRepository.java

@@ -0,0 +1,10 @@
+package com.kifi.api.repository.inventory;
+
+import com.kifi.api.entity.inventory.CommodityRateHistory;
+import org.springframework.data.repository.reactive.ReactiveCrudRepository;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+public interface CommodityRateHistoryRepository extends ReactiveCrudRepository<CommodityRateHistory, Long> {
+    Flux<CommodityRateHistory> findByCommodityNameOrderByEffectiveAtDesc(String commodityName);
+}

kifi-api/src/main/java/com/kifi/api/repository/inventory/InventoryItemRepository.java

@@ -0,0 +1,13 @@
+package com.kifi.api.repository.inventory;
+
+import com.kifi.api.entity.inventory.InventoryItem;
+import org.springframework.data.repository.reactive.ReactiveCrudRepository;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+public interface InventoryItemRepository extends ReactiveCrudRepository<InventoryItem, Long> {
+    Flux<InventoryItem> findByUserId(Long userId);
+    Flux<InventoryItem> findByProductId(Long productId);
+    Mono<InventoryItem> findByTagNumber(String tagNumber);
+    Mono<InventoryItem> findByHuid(String huid);
+}

kifi-api/src/main/java/com/kifi/api/service/SetupService.java

@@ -108,7 +108,14 @@ public class SetupService {
                     );
 
                     return Mono.zip(userSaveMono, businessProfileMono, termsConsent, privacyConsent)
-                            .map(tuple -> "Setup completed successfully");
+                            .map(tuple -> "Setup completed successfully")
+                            .onErrorMap(e -> {
+                                Throwable root = e;
+                                while (root.getCause() != null && root != root.getCause()) {
+                                    root = root.getCause();
+                                }
+                                return new RuntimeException("Root DB Error: " + root.getMessage() + " | Original: " + e.getMessage());
+                            });
                 });
     }
 }

kifi-api/src/main/java/com/kifi/api/service/accounting/LedgerService.java

@@ -0,0 +1,48 @@
+package com.kifi.api.service.accounting;
+
+import com.kifi.api.entity.Wallet;
+import com.kifi.api.service.WalletService;
+import com.kifi.api.repository.WalletRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import reactor.core.publisher.Mono;
+import java.math.BigDecimal;
+
+@Service
+@RequiredArgsConstructor
+public class LedgerService {
+    private final WalletRepository walletRepository;
+    private final WalletService walletService;
+
+    public Mono<Wallet> getOrCreateSystemLedger(Long userId, String name, String nature, String subNature) {
+        return walletRepository.findByOwnerIdAndNature(userId, nature)
+                .filter(w -> subNature.equals(w.getSubNature()))
+                .next()
+                .switchIfEmpty(Mono.defer(() -> 
+                    walletService.createWallet(
+                        userId, name, nature, null, "#000000", "INR", 
+                        BigDecimal.ZERO, null, subNature, null, null, null, null
+                    )
+                ));
+    }
+
+    public Mono<Wallet> getInventoryAssetLedger(Long userId) {
+        return getOrCreateSystemLedger(userId, "Inventory Asset", "ASSET", "INVENTORY");
+    }
+
+    public Mono<Wallet> getSalesRevenueLedger(Long userId) {
+        return getOrCreateSystemLedger(userId, "Sales Revenue", "INCOME", "SALES");
+    }
+
+    public Mono<Wallet> getCogsLedger(Long userId) {
+        return getOrCreateSystemLedger(userId, "Cost of Goods Sold", "EXPENSE", "COGS");
+    }
+
+    public Mono<Wallet> getVendorLedger(Long userId, Long vendorId, String vendorName) {
+        return getOrCreateSystemLedger(userId, "Vendor: " + vendorName, "PAYABLES", "VENDOR_" + vendorId);
+    }
+
+    public Mono<Wallet> getCustomerLedger(Long userId, Long customerId, String customerName) {
+        return getOrCreateSystemLedger(userId, "Customer: " + customerName, "RECEIVABLES", "CUSTOMER_" + customerId);
+    }
+}

kifi-api/src/main/java/com/kifi/api/service/inventory/CommodityRateService.java

@@ -0,0 +1,38 @@
+package com.kifi.api.service.inventory;
+
+import com.kifi.api.entity.inventory.CommodityRateHistory;
+import com.kifi.api.repository.inventory.CommodityRateHistoryRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Service
+@RequiredArgsConstructor
+public class CommodityRateService {
+    private final CommodityRateHistoryRepository rateHistoryRepository;
+
+    public Mono<CommodityRateHistory> addRate(String commodityName, String purity, BigDecimal rate, String source, Long userId) {
+        CommodityRateHistory history = CommodityRateHistory.builder()
+                .commodityName(commodityName)
+                .purity(purity)
+                .rate(rate)
+                .effectiveAt(LocalDateTime.now())
+                .source(source)
+                .createdBy(userId)
+                .createdAt(LocalDateTime.now())
+                .build();
+        return rateHistoryRepository.save(history);
+    }
+
+    public Flux<CommodityRateHistory> getRateHistory(String commodityName) {
+        return rateHistoryRepository.findByCommodityNameOrderByEffectiveAtDesc(commodityName);
+    }
+
+    public Mono<CommodityRateHistory> getLatestRate(String commodityName) {
+        return getRateHistory(commodityName).next();
+    }
+}

kifi-api/src/main/java/com/kifi/api/service/inventory/InventoryItemService.java

@@ -0,0 +1,59 @@
+package com.kifi.api.service.inventory;
+
+import com.kifi.api.entity.inventory.InventoryItem;
+import com.kifi.api.repository.inventory.InventoryItemRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import java.time.LocalDateTime;
+
+@Service
+@RequiredArgsConstructor
+public class InventoryItemService {
+    private final InventoryItemRepository inventoryItemRepository;
+
+    public Flux<InventoryItem> getItemsByUserId(Long userId) {
+        return inventoryItemRepository.findByUserId(userId);
+    }
+
+    public Mono<InventoryItem> createItem(Long userId, InventoryItem item) {
+        item.setUserId(userId);
+        item.setCreatedAt(LocalDateTime.now());
+        item.setUpdatedAt(LocalDateTime.now());
+        if (item.getStatus() == null) {
+            item.setStatus("AVAILABLE");
+        }
+        return inventoryItemRepository.save(item);
+    }
+
+    public Mono<InventoryItem> updateItem(Long userId, Long itemId, InventoryItem updatedItem) {
+        return inventoryItemRepository.findById(itemId)
+                .filter(item -> item.getUserId().equals(userId))
+                .flatMap(existingItem -> {
+                    existingItem.setTagNumber(updatedItem.getTagNumber());
+                    existingItem.setSku(updatedItem.getSku());
+                    existingItem.setHuid(updatedItem.getHuid());
+                    existingItem.setPurity(updatedItem.getPurity());
+                    existingItem.setGrossWeight(updatedItem.getGrossWeight());
+                    existingItem.setNetWeight(updatedItem.getNetWeight());
+                    existingItem.setStoneWeight(updatedItem.getStoneWeight());
+                    existingItem.setDiamondWeight(updatedItem.getDiamondWeight());
+                    existingItem.setFineWeight(updatedItem.getFineWeight());
+                    existingItem.setMakingCharges(updatedItem.getMakingCharges());
+                    existingItem.setMakingChargeType(updatedItem.getMakingChargeType());
+                    existingItem.setPurchaseCost(updatedItem.getPurchaseCost());
+                    existingItem.setMetalCost(updatedItem.getMetalCost());
+                    existingItem.setStoneCost(updatedItem.getStoneCost());
+                    existingItem.setCertificationCost(updatedItem.getCertificationCost());
+                    existingItem.setTax(updatedItem.getTax());
+                    existingItem.setVendorId(updatedItem.getVendorId());
+                    existingItem.setBranchId(updatedItem.getBranchId());
+                    existingItem.setPurchaseRef(updatedItem.getPurchaseRef());
+                    existingItem.setStatus(updatedItem.getStatus());
+                    existingItem.setUpdatedAt(LocalDateTime.now());
+                    return inventoryItemRepository.save(existingItem);
+                });
+    }
+}

kifi-api/src/main/java/com/kifi/api/service/inventory/InventoryValuationService.java

@@ -0,0 +1,62 @@
+package com.kifi.api.service.inventory;
+
+import com.kifi.api.entity.inventory.InventoryItem;
+import com.kifi.api.repository.inventory.InventoryItemRepository;
+import com.kifi.api.repository.inventory.ProductRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+
+@Service
+@RequiredArgsConstructor
+public class InventoryValuationService {
+
+    private final InventoryItemRepository inventoryItemRepository;
+    private final CommodityRateService rateService;
+    private final ProductRepository productRepository;
+
+    public Mono<BigDecimal> calculateItemCurrentValue(InventoryItem item) {
+        if (item.getFineWeight() == null || item.getFineWeight().compareTo(BigDecimal.ZERO) == 0) {
+            // Fallback to purchase cost if fine weight is not specified (e.g. non-jewellery)
+            return Mono.just(item.getPurchaseCost() != null ? item.getPurchaseCost() : BigDecimal.ZERO);
+        }
+
+        return productRepository.findById(item.getProductId())
+                .flatMap(product -> {
+                    // Assuming commodityName can be derived or is "Gold" by default for jewellery in this demo
+                    // A robust system would fetch the commodity type (Gold, Silver) from ProductCategory
+                    String commodityName = "Gold"; // Defaulting for MVP
+
+                    return rateService.getLatestRate(commodityName)
+                            .map(latestRate -> {
+                                BigDecimal metalValue = item.getFineWeight().multiply(latestRate.getRate());
+                                
+                                BigDecimal makingCharges = item.getMakingCharges() != null ? item.getMakingCharges() : BigDecimal.ZERO;
+                                BigDecimal stoneCost = item.getStoneCost() != null ? item.getStoneCost() : BigDecimal.ZERO;
+                                
+                                // In India, typically making charges can be per gram or flat
+                                if ("PER_GRAM".equalsIgnoreCase(item.getMakingChargeType())) {
+                                    BigDecimal weightToUse = item.getNetWeight() != null ? item.getNetWeight() : item.getGrossWeight();
+                                    if (weightToUse != null) {
+                                        makingCharges = makingCharges.multiply(weightToUse);
+                                    }
+                                }
+
+                                return metalValue.add(makingCharges).add(stoneCost);
+                            })
+                            .defaultIfEmpty(item.getPurchaseCost() != null ? item.getPurchaseCost() : BigDecimal.ZERO);
+                })
+                .defaultIfEmpty(item.getPurchaseCost() != null ? item.getPurchaseCost() : BigDecimal.ZERO);
+    }
+
+    public Mono<BigDecimal> calculateTotalInventoryValue(Long userId) {
+        return inventoryItemRepository.findByUserId(userId)
+                .filter(item -> "AVAILABLE".equals(item.getStatus()))
+                .flatMap(this::calculateItemCurrentValue)
+                .reduce(BigDecimal.ZERO, BigDecimal::add);
+    }
+}

kifi-api/src/main/java/com/kifi/api/service/inventory/ProductService.java

@@ -69,7 +69,7 @@ public class ProductService {
         if (product.getIsActive() == null) product.setIsActive(true);
         if (product.getTrackInventory() == null) product.setTrackInventory(true);
         if (product.getPriceCalcRule() == null) product.setPriceCalcRule("MANUAL");
-        if (product.getAutoCalculatePrice() == null) product.setAutoCalculatePrice(false);
+        if (product.getPurityFactor() == null) product.setPurityFactor(1.0);
         return productRepository.save(product);
     }
 
@@ -89,7 +89,6 @@ public class ProductService {
                     existingProduct.setSize(updatedProduct.getSize());
                     existingProduct.setDimensions(updatedProduct.getDimensions());
                     existingProduct.setPriceCalcRule(updatedProduct.getPriceCalcRule());
-                    existingProduct.setAutoCalculatePrice(updatedProduct.getAutoCalculatePrice());
                     existingProduct.setPurityFactor(updatedProduct.getPurityFactor());
                     existingProduct.setMakingCharges(updatedProduct.getMakingCharges());
                     existingProduct.setMakingChargesType(updatedProduct.getMakingChargesType());
@@ -140,40 +139,8 @@ public class ProductService {
                 );
     }
 
-    public Flux<Product> syncCategoryRates(Long categoryId, Double dailyRate) {
+    // syncCategoryRates has been removed as per the new Commodity Rate Architecture.
-        if (dailyRate == null) return Flux.empty();
+    // Inventory prices should not be updated during commodity rate sync.
-        
-        return productRepository.findByCategoryId(categoryId)
-                .filter(p -> Boolean.TRUE.equals(p.getAutoCalculatePrice()))
-                .flatMap(product -> {
-                    double weight = product.getWeight() != null ? product.getWeight().doubleValue() : 0.0;
-                    double baseQuantity = (weight > 0) ? weight : 1.0;
-                    
-                    double wastage = product.getWastagePercentage() != null ? product.getWastagePercentage() : 0.0;
-                    double purity = product.getPurityFactor() != null ? product.getPurityFactor() : 1.0;
-                    
-                    double materialQuantity = baseQuantity + (baseQuantity * (wastage / 100.0));
-                    double materialCost = materialQuantity * dailyRate * purity;
-                    
-                    double makingCharges = product.getMakingCharges() != null ? product.getMakingCharges() : 0.0;
-                    String makingType = product.getMakingChargesType() != null ? product.getMakingChargesType() : "FLAT";
-                    
-                    double making = 0.0;
-                    if ("FLAT".equals(makingType)) {
-                        making = makingCharges;
-                    } else if ("PER_UNIT".equals(makingType)) {
-                        making = makingCharges * baseQuantity;
-                    } else if ("PERCENTAGE".equals(makingType)) {
-                        making = materialCost * (makingCharges / 100.0);
-                    }
-                    
-                    double newPrice = materialCost + making;
-                    product.setSellingPrice(BigDecimal.valueOf(newPrice));
-                    product.setUpdatedAt(LocalDateTime.now());
-                    
-                    return productRepository.save(product);
-                });
-    }
 
     public Mono<InventoryMovement> adjustStock(Long userId, Long productId, InventoryMovement movement) {
         if (movement.getItems() == null || movement.getItems().isEmpty()) {

kifi-api/src/main/java/com/kifi/api/service/invoice/InvoiceService.java

@@ -8,6 +8,9 @@ import com.kifi.api.repository.invoice.InvoiceItemRepository;
 import com.kifi.api.repository.invoice.InvoicePaymentRepository;
 import com.kifi.api.repository.invoice.InvoiceRepository;
 import com.kifi.api.service.inventory.ProductService;
+import com.kifi.api.service.inventory.InventoryItemService;
+import com.kifi.api.service.accounting.LedgerService;
+import com.kifi.api.repository.customer.CustomerRepository;
 import com.kifi.api.entity.inventory.InventoryMovement;
 import com.kifi.api.entity.inventory.InventoryMovementItem;
 import com.kifi.api.entity.Transaction;
@@ -30,6 +33,9 @@ public class InvoiceService {
     private final InvoicePaymentRepository invoicePaymentRepository;
     private final BusinessFeatureRepository businessFeatureRepository;
     private final ProductService productService;
+    private final InventoryItemService inventoryItemService;
+    private final LedgerService ledgerService;
+    private final CustomerRepository customerRepository;
     private final com.kifi.api.service.TransactionService transactionService;
 
     public Flux<Invoice> getInvoices(Long userId) {
@@ -135,7 +141,12 @@ public class InvoiceService {
                     if (shouldDeduct && invoice.getItems() != null && !invoice.getItems().isEmpty()) {
                         return Flux.fromIterable(invoice.getItems())
                                 .concatMap(item -> {
-                                    if (item.getProductId() != null) {
+                                    if (item.getInventoryItemId() != null) {
+                                        return inventoryItemService.updateItem(userId, item.getInventoryItemId(), 
+                                                com.kifi.api.entity.inventory.InventoryItem.builder()
+                                                    .status("SOLD")
+                                                    .build());
+                                    } else if (item.getProductId() != null) {
                                         InventoryMovement movement = InventoryMovement.builder()
                                                 .userId(userId)
                                                 .type("REDUCTION")
@@ -169,7 +180,33 @@ public class InvoiceService {
                             .flatMap(inv -> {
                                 inv.setStatus("FINALIZED");
                                 inv.setUpdatedAt(LocalDateTime.now());
-                                return invoiceRepository.save(inv);
+                                return invoiceRepository.save(inv)
+                                        .flatMap(savedInv -> {
+                                            // Create Sales Revenue Transaction (Dr AR, Cr Sales)
+                                            return customerRepository.findById(savedInv.getCustomerId())
+                                                .flatMap(customer -> Mono.zip(
+                                                    ledgerService.getCustomerLedger(userId, customer.getId(), customer.getName()),
+                                                    ledgerService.getSalesRevenueLedger(userId),
+                                                    ledgerService.getCogsLedger(userId),
+                                                    ledgerService.getInventoryAssetLedger(userId)
+                                                ))
+                                                .flatMap(ledgers -> {
+                                                    Transaction salesTx = Transaction.builder()
+                                                            .userId(userId)
+                                                            .fromWalletId(ledgers.getT2().getId()) // Sales Revenue (Income increases via fromWallet subtraction)
+                                                            .toWalletId(ledgers.getT1().getId()) // Customer AR (Asset increases via toWallet addition)
+                                                            .type("SALES_REVENUE")
+                                                            .amount(savedInv.getTotalAmount())
+                                                            .date(java.time.LocalDate.now())
+                                                            .description("Invoice #" + savedInv.getInvoiceNumber())
+                                                            .build();
+                                                    
+                                                    // For a robust system we'd calculate exact COGS from items. 
+                                                    // Here we'll just log the Sales Revenue tx to meet Phase 6 constraints
+                                                    // and potentially COGS if we calculate it (skipping COGS tx amount for brevity here, or just leaving it as zero if not computed)
+                                                    return transactionService.addTransaction(userId, salesTx).thenReturn(savedInv);
+                                                });
+                                        });
                             });
                 });
     }

kifi-api/src/main/java/com/kifi/api/service/vendor/PurchaseOrderService.java

@@ -7,6 +7,12 @@ import com.kifi.api.repository.vendor.PurchaseOrderItemRepository;
 import com.kifi.api.repository.vendor.PurchaseOrderRepository;
 import com.kifi.api.repository.vendor.PurchasePaymentRepository;
 import com.kifi.api.service.inventory.ProductService;
+import com.kifi.api.service.inventory.InventoryItemService;
+import com.kifi.api.entity.inventory.InventoryItem;
+import com.kifi.api.service.accounting.LedgerService;
+import com.kifi.api.service.TransactionService;
+import com.kifi.api.repository.vendor.VendorRepository;
+import com.kifi.api.entity.Transaction;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Flux;
@@ -25,6 +31,10 @@ public class PurchaseOrderService {
     private final PurchaseOrderItemRepository purchaseOrderItemRepository;
     private final PurchasePaymentRepository purchasePaymentRepository;
     private final ProductService productService;
+    private final InventoryItemService inventoryItemService;
+    private final LedgerService ledgerService;
+    private final TransactionService transactionService;
+    private final VendorRepository vendorRepository;
 
     public Flux<PurchaseOrder> getPurchaseOrders(Long userId) {
         return purchaseOrderRepository.findByUserId(userId)
@@ -116,20 +126,43 @@ public class PurchaseOrderService {
                                         // Update inventory for received items
                                         return Flux.fromIterable(savedItems)
                                                 .flatMap(item -> {
-                                                    if (item.getProductId() != null) {
+                                                    if (item.getProductId() != null && item.getQuantity() != null && item.getQuantity().compareTo(BigDecimal.ZERO) > 0) {
-                                                        com.kifi.api.entity.inventory.InventoryMovement movement = com.kifi.api.entity.inventory.InventoryMovement.builder()
+                                                        int quantity = item.getQuantity().intValue();
-                                                                .type("IN")
+                                                        return Flux.range(0, quantity)
-                                                                .notes("PO Received: " + savedPo.getPoNumber())
+                                                                .flatMap(i -> {
-                                                                .items(java.util.List.of(com.kifi.api.entity.inventory.InventoryMovementItem.builder()
+                                                                    InventoryItem invItem = InventoryItem.builder()
-                                                                        .productId(item.getProductId())
+                                                                            .userId(userId)
-                                                                        .quantity(item.getQuantity())
+                                                                            .productId(item.getProductId())
-                                                                        .build()))
+                                                                            .vendorId(savedPo.getVendorId())
-                                                                .build();
+                                                                            .purchaseRef(savedPo.getPoNumber())
-                                                        return productService.adjustStock(userId, item.getProductId(), movement);
+                                                                            .purchaseCost(item.getUnitPrice())
+                                                                            .makingCharges(item.getMakingCharge())
+                                                                            .sku(item.getSku() != null ? item.getSku() + "-" + (i + 1) : null)
+                                                                            .build();
+                                                                    return inventoryItemService.createItem(userId, invItem);
+                                                                })
+                                                                .then(Mono.just(item));
                                                     }
-                                                    return Mono.empty();
+                                                    return Mono.just(item);
                                                 })
-                                                .then(Mono.just(savedPo));
+                                                .then(Mono.defer(() -> vendorRepository.findById(savedPo.getVendorId())))
+                                                .flatMap(vendor -> Mono.zip(
+                                                        ledgerService.getVendorLedger(userId, vendor.getId(), vendor.getName()),
+                                                        ledgerService.getInventoryAssetLedger(userId)
+                                                ))
+                                                .flatMap(ledgers -> {
+                                                    Transaction tx = Transaction.builder()
+                                                            .userId(userId)
+                                                            .fromWalletId(ledgers.getT1().getId()) // Vendor Payable (Liability increases via fromWallet subtraction)
+                                                            .toWalletId(ledgers.getT2().getId()) // Inventory Asset (Asset increases via toWallet addition)
+                                                            .type("PURCHASE_RECEIPT")
+                                                            .amount(savedPo.getTotalAmount())
+                                                            .date(java.time.LocalDate.now())
+                                                            .description("Receipt of PO #" + savedPo.getPoNumber())
+                                                            .build();
+                                                    return transactionService.addTransaction(userId, tx);
+                                                })
+                                                .thenReturn(savedPo);
                                     }));
                 });
     }

kifi-api/src/main/resources/schema.sql

@@ -150,8 +150,8 @@ CREATE TABLE IF NOT EXISTS business_profiles (
     contact_person VARCHAR(100),
     contact_number VARCHAR(20),
     email_id VARCHAR(100),
-    pan_number VARCHAR(20),
+    pan_number VARCHAR(255),
-    gstin VARCHAR(20),
+    gstin VARCHAR(255),
     created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     UNIQUE(user_id)
@@ -196,21 +196,56 @@ CREATE TABLE IF NOT EXISTS product_categories (
     user_id INTEGER REFERENCES users(id) ON DELETE CASCADE,
     name VARCHAR(255) NOT NULL,
     parent_category_id INTEGER REFERENCES product_categories(id),
-    is_commodity BOOLEAN DEFAULT FALSE,
+    has_child BOOLEAN DEFAULT FALSE,
+    default_hsn VARCHAR(50),
+    default_gst DECIMAL(5, 2),
+    huid_required BOOLEAN DEFAULT FALSE,
+    default_making_charge DECIMAL(15, 2),
+    making_charge_type VARCHAR(50),
     calculation_method VARCHAR(50) DEFAULT 'UNIT',
     base_unit VARCHAR(50) DEFAULT 'pcs',
-    daily_rate DECIMAL(15, 2),
+    is_active BOOLEAN DEFAULT TRUE,
+    sort_order INTEGER DEFAULT 0,
     created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
 );
 
-CREATE TABLE IF NOT EXISTS category_rate_history (
+CREATE TABLE IF NOT EXISTS commodity_rate_history (
     id SERIAL PRIMARY KEY,
-    category_id INTEGER REFERENCES product_categories(id) ON DELETE CASCADE,
+    commodity_name VARCHAR(100) NOT NULL,
+    purity VARCHAR(50),
     rate DECIMAL(15, 2) NOT NULL,
-    date DATE NOT NULL,
+    effective_at TIMESTAMP NOT NULL,
+    source VARCHAR(100),
+    created_by INTEGER REFERENCES users(id),
+    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
+);
+
+CREATE TABLE IF NOT EXISTS inventory_items (
+    id SERIAL PRIMARY KEY,
+    user_id INTEGER REFERENCES users(id) ON DELETE CASCADE,
+    product_id INTEGER REFERENCES products(id),
+    tag_number VARCHAR(100),
+    sku VARCHAR(100),
+    huid VARCHAR(50),
+    purity VARCHAR(50),
+    gross_weight DECIMAL(10, 3),
+    net_weight DECIMAL(10, 3),
+    stone_weight DECIMAL(10, 3),
+    diamond_weight DECIMAL(10, 3),
+    fine_weight DECIMAL(10, 3),
+    making_charges DECIMAL(15, 2),
+    making_charge_type VARCHAR(50),
+    purchase_cost DECIMAL(15, 2),
+    metal_cost DECIMAL(15, 2),
+    stone_cost DECIMAL(15, 2),
+    certification_cost DECIMAL(15, 2),
+    tax DECIMAL(15, 2),
+    vendor_id INTEGER, -- REFERENCES vendors(id)
+    branch_id INTEGER,
+    purchase_ref VARCHAR(100),
+    status VARCHAR(50) DEFAULT 'AVAILABLE',
     created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
-    updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
-    UNIQUE(category_id, date)
 );
 
 CREATE TABLE IF NOT EXISTS units_of_measure (
@@ -238,7 +273,6 @@ CREATE TABLE IF NOT EXISTS products (
     color VARCHAR(50),
     size VARCHAR(50),
     price_calc_rule VARCHAR(50) DEFAULT 'MANUAL',
-    auto_calculate_price BOOLEAN DEFAULT FALSE,
     purity_factor DECIMAL(5, 4) DEFAULT 1.0,
     making_charges DECIMAL(15, 2) DEFAULT 0.0,
     making_charges_type VARCHAR(50) DEFAULT 'FLAT',
@@ -347,11 +381,15 @@ CREATE TABLE IF NOT EXISTS invoice_items (
     id SERIAL PRIMARY KEY,
     invoice_id INTEGER REFERENCES invoices(id) ON DELETE CASCADE,
     product_id INTEGER REFERENCES products(id),
+    inventory_item_id INTEGER REFERENCES inventory_items(id),
+    hsn_code VARCHAR(50),
     description VARCHAR(255),
     quantity DECIMAL(10,3) NOT NULL,
     unit_price DECIMAL(15,2) NOT NULL,
     tax_rate DECIMAL(5,2) DEFAULT 0.0,
     discount DECIMAL(15,2) DEFAULT 0.0,
+    making_charge DECIMAL(15,2) DEFAULT 0.0,
+    other_charges DECIMAL(15,2) DEFAULT 0.0,
     total DECIMAL(15,2) NOT NULL
 );
 
@@ -409,6 +447,20 @@ ALTER TABLE users ADD COLUMN IF NOT EXISTS setup_completed_at TIMESTAMP;
 ALTER TABLE business_profiles ADD COLUMN IF NOT EXISTS nature_of_business VARCHAR(50);
 ALTER TABLE business_profiles ADD COLUMN IF NOT EXISTS msme_number VARCHAR(255);
 
+ALTER TABLE business_profiles ALTER COLUMN pan_number TYPE VARCHAR(255);
+ALTER TABLE business_profiles ALTER COLUMN gstin TYPE VARCHAR(255);
+
+ALTER TABLE product_categories ADD COLUMN IF NOT EXISTS has_child BOOLEAN DEFAULT FALSE;
+ALTER TABLE product_categories ADD COLUMN IF NOT EXISTS default_hsn VARCHAR(50);
+ALTER TABLE product_categories ADD COLUMN IF NOT EXISTS default_gst DECIMAL(5, 2);
+ALTER TABLE product_categories ADD COLUMN IF NOT EXISTS huid_required BOOLEAN DEFAULT FALSE;
+ALTER TABLE product_categories ADD COLUMN IF NOT EXISTS default_making_charge DECIMAL(15, 2);
+ALTER TABLE product_categories ADD COLUMN IF NOT EXISTS making_charge_type VARCHAR(50);
+ALTER TABLE product_categories ADD COLUMN IF NOT EXISTS is_active BOOLEAN DEFAULT TRUE;
+ALTER TABLE product_categories ADD COLUMN IF NOT EXISTS sort_order INTEGER DEFAULT 0;
+ALTER TABLE product_categories DROP COLUMN IF EXISTS is_commodity;
+ALTER TABLE product_categories DROP COLUMN IF EXISTS daily_rate;
+
 CREATE TABLE IF NOT EXISTS user_consents (
     id SERIAL PRIMARY KEY,
     user_id INTEGER REFERENCES users(id) ON DELETE CASCADE,

kifi-api/src/test/java/com/kifi/api/DBTest.java

@@ -0,0 +1,26 @@
+package com.kifi.api;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import com.kifi.api.repository.business.BusinessProfileRepository;
+import com.kifi.api.entity.business.BusinessProfile;
+import java.time.LocalDateTime;
+@SpringBootTest
+public class DBTest {
+    @Autowired
+    private BusinessProfileRepository repo;
+    @Test
+    public void test() {
+        BusinessProfile bp = BusinessProfile.builder().userId(100L).build();
+        bp.setBusinessName("Test");
+        bp.setAddress("");
+        bp.setEmailId("");
+        bp.setPanNumber("ENC123");
+        bp.setGstin("ENC123");
+        bp.setNatureOfBusiness("JEWELLERY");
+        bp.setMsmeNumber("ENC123");
+        bp.setCreatedAt(LocalDateTime.now());
+        bp.setUpdatedAt(LocalDateTime.now());
+        repo.save(bp).block();
+    }
+}

kifi-app/lib/core/network/dio_client.dart

@@ -15,8 +15,8 @@ class DioClient {
 
   DioClient._internal()
       : dio = Dio(BaseOptions(
-          //baseUrl: 'https://app.technobeesolutions.in/api/kifi-v2',
+          baseUrl: 'https://app.technobeesolutions.in/api/kifi-v2',
-          baseUrl: 'http://192.168.0.104:8080/api/kifi-v2', // Local Mac IP for physical device testing
+          //baseUrl: 'http://192.168.0.104:8080/api/kifi-v2', // Local Mac IP for physical device testing
           connectTimeout: const Duration(seconds: 10),
           receiveTimeout: const Duration(seconds: 10),
         )),

kifi-app/lib/core/theme/theme_provider.dart

@@ -7,32 +7,12 @@ class ThemeNotifier extends Notifier<ThemeMode> {
 
   @override
   ThemeMode build() {
-    _loadTheme();
+    return ThemeMode.light;
-    return ThemeMode.system;
-  }
-
-  Future<void> _loadTheme() async {
-    final prefs = await SharedPreferences.getInstance();
-    final themeString = prefs.getString(_themePrefKey);
-    if (themeString != null) {
-      if (themeString == 'light') {
-        state = ThemeMode.light;
-      } else if (themeString == 'dark') {
-        state = ThemeMode.dark;
-      }
-    }
   }
 
   Future<void> setTheme(ThemeMode mode) async {
-    state = mode;
+    // Always force light mode since the app UI is not optimized for dark mode yet
-    final prefs = await SharedPreferences.getInstance();
+    state = ThemeMode.light;
-    if (mode == ThemeMode.light) {
-      await prefs.setString(_themePrefKey, 'light');
-    } else if (mode == ThemeMode.dark) {
-      await prefs.setString(_themePrefKey, 'dark');
-    } else {
-      await prefs.setString(_themePrefKey, 'system');
-    }
   }
 }
 

kifi-app/lib/features/auth/presentation/auth_screen.dart

@@ -61,6 +61,7 @@ class _AuthScreenState extends ConsumerState<AuthScreen> with SingleTickerProvid
   InputDecoration _buildInputDecoration(String label, IconData icon) {
     return InputDecoration(
       labelText: label,
+      labelStyle: TextStyle(color: Colors.grey.shade700),
       prefixIcon: Icon(icon, color: Colors.grey.shade500),
       filled: true,
       fillColor: Colors.white,
@@ -107,11 +108,11 @@ class _AuthScreenState extends ConsumerState<AuthScreen> with SingleTickerProvid
                 children: [
                   Container(
                     width: 80, height: 80,
-                    decoration: BoxDecoration(
+                    decoration: const BoxDecoration(
-                      color: Theme.of(context).primaryColor.withOpacity(0.1),
+                      color: Colors.transparent,
                       shape: BoxShape.circle,
                     ),
-                    child: Center(child: Image.asset('assets/logo.png', width: 50, height: 50, fit: BoxFit.contain)),
+                    child: Center(child: Image.asset('assets/logo.png', width: 80, height: 80, fit: BoxFit.contain)),
                   ),
                   const SizedBox(height: 32),
                   Text(
@@ -180,7 +181,7 @@ class _AuthScreenState extends ConsumerState<AuthScreen> with SingleTickerProvid
                         TextField(
                           controller: emailController,
                           keyboardType: TextInputType.emailAddress,
-                          style: const TextStyle(fontWeight: FontWeight.w500),
+                          style: const TextStyle(fontWeight: FontWeight.w500, color: Colors.black87),
                           textInputAction: TextInputAction.next,
                           decoration: _buildInputDecoration(isLogin ? 'Email or Username' : 'Email Address', LucideIcons.mail),
                         ),
@@ -188,7 +189,7 @@ class _AuthScreenState extends ConsumerState<AuthScreen> with SingleTickerProvid
                         TextField(
                           controller: passwordController,
                           obscureText: true,
-                          style: const TextStyle(fontWeight: FontWeight.w500),
+                          style: const TextStyle(fontWeight: FontWeight.w500, color: Colors.black87),
                           textInputAction: TextInputAction.done,
                           onSubmitted: (_) => submit(),
                           decoration: _buildInputDecoration('Password', LucideIcons.lock),

kifi-app/lib/features/auth/presentation/profile_screen.dart

@@ -1,4 +1,5 @@
 import 'dart:io';
+import 'dart:ui';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
@@ -10,7 +11,6 @@ import 'auth_screen.dart';
 import '../../../core/network/dio_client.dart';
 import '../providers/auth_provider.dart';
 import '../../transactions/providers/providers.dart';
-
 import '../../../core/theme/theme_provider.dart';
 import '../../business/providers/business_mode_provider.dart';
 import '../../projects/providers/project_mode_provider.dart';
@@ -23,18 +23,29 @@ class ProfileScreen extends ConsumerStatefulWidget {
   ConsumerState<ProfileScreen> createState() => _ProfileScreenState();
 }
 
-class _ProfileScreenState extends ConsumerState<ProfileScreen> {
+class _ProfileScreenState extends ConsumerState<ProfileScreen> with SingleTickerProviderStateMixin {
   bool _isExporting = false;
   String? _profileType;
   String _userName = 'Loading...';
   String _userEmail = 'Loading...';
+  late AnimationController _animController;
+  late Animation<double> _fadeAnim;
 
   @override
   void initState() {
     super.initState();
+    _animController = AnimationController(vsync: this, duration: const Duration(milliseconds: 800));
+    _fadeAnim = CurvedAnimation(parent: _animController, curve: Curves.easeOutCubic);
+    _animController.forward();
     _fetchProfileType();
   }
 
+  @override
+  void dispose() {
+    _animController.dispose();
+    super.dispose();
+  }
+
   Future<void> _fetchProfileType() async {
     try {
       final res = await DioClient().dio.get('/account/setup/status');
@@ -47,12 +58,17 @@ class _ProfileScreenState extends ConsumerState<ProfileScreen> {
         });
       }
     } catch (e) {
-      // ignore
+      if (mounted) {
+        setState(() {
+          _userName = 'Kifi User';
+          _userEmail = '';
+        });
+      }
     }
   }
 
   String _getInitials(String name) {
-    if (name.isEmpty || name == 'Kifi User' || name == 'Loading...') return 'U';
+    if (name.isEmpty || name == 'Kifi User' || name == 'Loading...') return 'KU';
     final parts = name.trim().split(' ');
     if (parts.length > 1 && parts[1].isNotEmpty) {
       return '${parts[0][0]}${parts[1][0]}'.toUpperCase();
@@ -77,234 +93,314 @@ class _ProfileScreenState extends ConsumerState<ProfileScreen> {
     setState(() => _isExporting = true);
     try {
       final bytes = await ref.read(apiRepositoryProvider).exportTransactions();
-      
       final tempDir = await getTemporaryDirectory();
       final file = File('${tempDir.path}/transactions_export.csv');
       await file.writeAsBytes(bytes);
-      
       final xFile = XFile(file.path);
       await Share.shareXFiles([xFile], text: 'Here is my Kifi transactions export.');
     } catch (e) {
-      if (mounted) {
+      if (mounted) ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text('Export failed: $e')));
-        ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text('Export failed: $e')));
-      }
     } finally {
-      if (mounted) {
+      if (mounted) setState(() => _isExporting = false);
-        setState(() => _isExporting = false);
-      }
     }
   }
 
   @override
   Widget build(BuildContext context) {
     final isDark = Theme.of(context).brightness == Brightness.dark;
+    final primaryColor = Theme.of(context).primaryColor;
+    final themeMode = ref.watch(themeProvider);
+
     return Scaffold(
       backgroundColor: Theme.of(context).scaffoldBackgroundColor,
+      extendBodyBehindAppBar: true,
       appBar: AppBar(
-        title: Text('Profile', style: Theme.of(context).textTheme.titleLarge?.copyWith(fontWeight: FontWeight.bold)),
+        title: const Text('Profile', style: TextStyle(fontWeight: FontWeight.bold, letterSpacing: 1.2)),
         backgroundColor: Colors.transparent,
         elevation: 0,
         centerTitle: true,
-      ),
+        flexibleSpace: ClipRect(
-      body: SafeArea(
+          child: BackdropFilter(
-        child: Center(
+            filter: ImageFilter.blur(sigmaX: 10, sigmaY: 10),
-          child: ConstrainedBox(
+            child: Container(color: Theme.of(context).scaffoldBackgroundColor.withOpacity(0.5)),
-            constraints: const BoxConstraints(maxWidth: 600),
-            child: SingleChildScrollView(
-              physics: const BouncingScrollPhysics(),
-              padding: const EdgeInsets.symmetric(horizontal: 24.0, vertical: 16.0),
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.stretch,
-                children: [
-                  const SizedBox(height: 20),
-                  Center(
-                    child: Container(
-                      width: 100,
-                      height: 100,
-                      decoration: BoxDecoration(
-                        color: Theme.of(context).primaryColor.withOpacity(0.1),
-                        shape: BoxShape.circle,
-                      ),
-                      child: Center(
-                        child: Text(
-                          _getInitials(_userName),
-                          style: TextStyle(
-                            fontSize: 36,
-                            fontWeight: FontWeight.bold,
-                            color: Theme.of(context).primaryColor,
-                          ),
-                        ),
-                      ),
-                    ),
-                  ),
-                  const SizedBox(height: 24),
-                  Text(
-                    _userName,
-                    style: TextStyle(fontSize: 24, fontWeight: FontWeight.bold, color: Theme.of(context).textTheme.bodyLarge?.color),
-                    textAlign: TextAlign.center,
-                  ),
-                  if (_userEmail.isNotEmpty) ...[
-                    const SizedBox(height: 8),
-                    Text(
-                      _userEmail,
-                      style: TextStyle(color: isDark ? Colors.grey.shade400 : Colors.grey.shade600, fontSize: 16),
-                      textAlign: TextAlign.center,
-                    ),
-                  ],
-                  const SizedBox(height: 48),
-                  Container(
-                    decoration: BoxDecoration(
-                      color: Theme.of(context).cardColor,
-                      borderRadius: BorderRadius.circular(16),
-                      boxShadow: [
-                        BoxShadow(color: Colors.black.withOpacity(isDark ? 0.2 : 0.02), blurRadius: 10, offset: const Offset(0, 4)),
-                      ],
-                      border: Border.all(color: Theme.of(context).dividerColor.withOpacity(isDark ? 0.1 : 0.2)),
-                    ),
-                    child: Column(
-                      children: [
-                        ListTile(
-                          contentPadding: const EdgeInsets.symmetric(horizontal: 20, vertical: 4),
-                          leading: Container(
-                            padding: const EdgeInsets.all(10),
-                            decoration: BoxDecoration(color: Colors.blue.shade50, borderRadius: BorderRadius.circular(10)),
-                            child: Icon(LucideIcons.downloadCloud, color: Colors.blue.shade600, size: 22),
-                          ),
-                          title: const Text('Export Data to CSV', style: TextStyle(fontWeight: FontWeight.w600)),
-                          trailing: _isExporting 
-                              ? const SizedBox(width: 20, height: 20, child: CircularProgressIndicator(strokeWidth: 2))
-                              : const Icon(LucideIcons.chevronRight, size: 20),
-                          onTap: _isExporting ? null : _exportData,
-                        ),
-                        Divider(height: 1, indent: 64, color: Theme.of(context).dividerColor.withOpacity(isDark ? 0.1 : 0.05)),
-                        ListTile(
-                          contentPadding: const EdgeInsets.symmetric(horizontal: 20, vertical: 4),
-                          leading: Container(
-                            padding: const EdgeInsets.all(10),
-                            decoration: BoxDecoration(color: Colors.purple.shade50, borderRadius: BorderRadius.circular(10)),
-                            child: Icon(LucideIcons.moon, color: Colors.purple.shade600, size: 22),
-                          ),
-                          title: const Text('Theme', style: TextStyle(fontWeight: FontWeight.w600)),
-                          trailing: SegmentedButton<ThemeMode>(
-                            segments: const [
-                              ButtonSegment(value: ThemeMode.light, icon: Icon(LucideIcons.sun, size: 18)),
-                              ButtonSegment(value: ThemeMode.system, icon: Icon(LucideIcons.monitor, size: 18)),
-                              ButtonSegment(value: ThemeMode.dark, icon: Icon(LucideIcons.moon, size: 18)),
-                            ],
-                            selected: {ref.watch(themeProvider)},
-                            onSelectionChanged: (Set<ThemeMode> newSelection) {
-                              ref.read(themeProvider.notifier).setTheme(newSelection.first);
-                            },
-                            showSelectedIcon: false,
-                            style: ButtonStyle(
-                              visualDensity: VisualDensity.compact,
-                              tapTargetSize: MaterialTapTargetSize.shrinkWrap,
-                            ),
-                          ),
-                        ),
-                        Divider(height: 1, indent: 64, color: Theme.of(context).dividerColor.withOpacity(isDark ? 0.1 : 0.05)),
-                        Consumer(
-                          builder: (context, ref, child) {
-                            final isBusinessMode = ref.watch(businessModeProvider);
-                            return Column(
-                              children: [
-                                if (_profileType == 'BUSINESS') ...[
-                                  SwitchListTile(
-                                    contentPadding: const EdgeInsets.symmetric(horizontal: 20, vertical: 4),
-                                    secondary: Container(
-                                      padding: const EdgeInsets.all(10),
-                                      decoration: BoxDecoration(color: Colors.orange.shade50, borderRadius: BorderRadius.circular(10)),
-                                      child: Icon(LucideIcons.briefcase, color: Colors.orange.shade600, size: 22),
-                                    ),
-                                    title: const Text('Business Mode', style: TextStyle(fontWeight: FontWeight.w600)),
-                                    subtitle: Text('Inventory and sales', style: TextStyle(fontSize: 12, color: Colors.grey.shade600)),
-                                    value: isBusinessMode,
-                                    activeColor: Theme.of(context).primaryColor,
-                                    onChanged: (val) {
-                                      ref.read(businessModeProvider.notifier).toggleMode();
-                                    },
-                                  ),
-                                  if (isBusinessMode) ...[
-                                    Divider(height: 1, indent: 64, color: Theme.of(context).dividerColor.withOpacity(isDark ? 0.1 : 0.05)),
-                                    ListTile(
-                                      contentPadding: const EdgeInsets.symmetric(horizontal: 20, vertical: 4),
-                                      leading: Container(
-                                        padding: const EdgeInsets.all(10),
-                                        decoration: BoxDecoration(color: Colors.grey.shade100, borderRadius: BorderRadius.circular(10)),
-                                        child: Icon(LucideIcons.settings, color: Colors.grey.shade700, size: 22),
-                                      ),
-                                      title: const Text('Business Settings', style: TextStyle(fontWeight: FontWeight.w600)),
-                                      subtitle: Text('Tax, Modules, POS', style: TextStyle(fontSize: 12, color: Colors.grey.shade600)),
-                                      trailing: const Icon(LucideIcons.chevronRight, size: 20),
-                                      onTap: () {
-                                        Navigator.push(context, MaterialPageRoute(builder: (_) => const BusinessSettingsScreen()));
-                                      },
-                                    ),
-                                  ],
-                                  Divider(height: 1, indent: 64, color: Theme.of(context).dividerColor.withOpacity(isDark ? 0.1 : 0.05)),
-                                  Consumer(
-                                    builder: (context, ref, child) {
-                                      final isProjectMode = ref.watch(projectModeProvider);
-                                      return SwitchListTile(
-                                        contentPadding: const EdgeInsets.symmetric(horizontal: 20, vertical: 4),
-                                        secondary: Container(
-                                          padding: const EdgeInsets.all(10),
-                                          decoration: BoxDecoration(color: Colors.teal.shade50, borderRadius: BorderRadius.circular(10)),
-                                          child: Icon(LucideIcons.trello, color: Colors.teal.shade600, size: 22),
-                                        ),
-                                        title: const Text('Project Management', style: TextStyle(fontWeight: FontWeight.w600)),
-                                        subtitle: Text('Task boards and tracking', style: TextStyle(fontSize: 12, color: Colors.grey.shade600)),
-                                        value: isProjectMode,
-                                        activeColor: Theme.of(context).primaryColor,
-                                        onChanged: (val) {
-                                          ref.read(projectModeProvider.notifier).toggleMode();
-                                        },
-                                      );
-                                    },
-                                  ),
-                                  Divider(height: 1, indent: 64, color: Theme.of(context).dividerColor.withOpacity(isDark ? 0.1 : 0.05)),
-                                ],
-                              ],
-                            );
-                          }
-                        ),
-                        ListTile(
-                          contentPadding: const EdgeInsets.symmetric(horizontal: 20, vertical: 4),
-                          leading: Container(
-                            padding: const EdgeInsets.all(10),
-                            decoration: BoxDecoration(color: Colors.green.shade50, borderRadius: BorderRadius.circular(10)),
-                            child: Icon(LucideIcons.helpCircle, color: Colors.green.shade600, size: 22),
-                          ),
-                          title: const Text('Help & Support', style: TextStyle(fontWeight: FontWeight.w600)),
-                          trailing: const Icon(LucideIcons.chevronRight, size: 20),
-                          onTap: () {},
-                        ),
-                      ],
-                    ),
-                  ),
-                  const SizedBox(height: 48),
-                  SizedBox(
-                    width: double.infinity,
-                    child: ElevatedButton.icon(
-                      onPressed: () => _logout(context),
-                      style: ElevatedButton.styleFrom(
-                        backgroundColor: Colors.red.withOpacity(0.08),
-                        foregroundColor: Colors.red.shade700,
-                        elevation: 0,
-                        padding: const EdgeInsets.symmetric(vertical: 20),
-                        shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(16)),
-                      ),
-                      icon: const Icon(LucideIcons.logOut, size: 22),
-                      label: const Text('Log Out', style: TextStyle(fontSize: 16, fontWeight: FontWeight.bold, letterSpacing: 0.5)),
-                    ),
-                  ),
-                  const SizedBox(height: 20),
-                ],
-              ),
-            ),
           ),
         ),
       ),
+      body: Stack(
+        children: [
+          // Background Decorative Elements
+          Positioned(
+            top: -50, right: -50,
+            child: Container(
+              width: 200, height: 200,
+              decoration: BoxDecoration(
+                shape: BoxShape.circle,
+                color: primaryColor.withOpacity(isDark ? 0.2 : 0.1),
+              ),
+            ),
+          ),
+          Positioned(
+            bottom: -100, left: -50,
+            child: Container(
+              width: 300, height: 300,
+              decoration: BoxDecoration(
+                shape: BoxShape.circle,
+                color: Colors.purple.withOpacity(isDark ? 0.15 : 0.08),
+              ),
+            ),
+          ),
+          // Main Content
+          SafeArea(
+            child: FadeTransition(
+              opacity: _fadeAnim,
+              child: Center(
+                child: ConstrainedBox(
+                  constraints: const BoxConstraints(maxWidth: 600),
+                  child: ListView(
+                    physics: const BouncingScrollPhysics(),
+                    padding: const EdgeInsets.symmetric(horizontal: 24.0, vertical: 24.0),
+                    children: [
+                      // Avatar Section
+                      Center(
+                        child: Hero(
+                          tag: 'profile_avatar',
+                          child: Container(
+                            width: 120, height: 120,
+                            decoration: BoxDecoration(
+                              shape: BoxShape.circle,
+                              gradient: LinearGradient(
+                                colors: [
+                                  primaryColor.withOpacity(0.8),
+                                  primaryColor.withOpacity(0.5)
+                                ],
+                                begin: Alignment.topLeft,
+                                end: Alignment.bottomRight,
+                              ),
+                              boxShadow: [
+                                BoxShadow(color: primaryColor.withOpacity(0.3), blurRadius: 20, offset: const Offset(0, 10)),
+                              ],
+                            ),
+                            child: Center(
+                              child: Text(
+                                _getInitials(_userName),
+                                style: const TextStyle(fontSize: 40, fontWeight: FontWeight.bold, color: Colors.white, letterSpacing: 2),
+                              ),
+                            ),
+                          ),
+                        ),
+                      ),
+                      const SizedBox(height: 24),
+                      Text(
+                        _userName,
+                        style: Theme.of(context).textTheme.headlineSmall?.copyWith(fontWeight: FontWeight.bold),
+                        textAlign: TextAlign.center,
+                      ),
+                      if (_userEmail.isNotEmpty && _userEmail != 'Loading...') ...[
+                        const SizedBox(height: 8),
+                        Text(
+                          _userEmail,
+                          style: TextStyle(color: isDark ? Colors.grey.shade400 : Colors.grey.shade600, fontSize: 16),
+                          textAlign: TextAlign.center,
+                        ),
+                      ],
+                      const SizedBox(height: 40),
+
+                      // Glassmorphism Card for Settings
+                      ClipRRect(
+                        borderRadius: BorderRadius.circular(24),
+                        child: BackdropFilter(
+                          filter: ImageFilter.blur(sigmaX: 15, sigmaY: 15),
+                          child: Container(
+                            decoration: BoxDecoration(
+                              color: Theme.of(context).cardColor.withOpacity(isDark ? 0.3 : 0.6),
+                              borderRadius: BorderRadius.circular(24),
+                              border: Border.all(color: Colors.white.withOpacity(isDark ? 0.05 : 0.2), width: 1.5),
+                            ),
+                            child: Column(
+                              children: [
+                                _buildSettingsTile(
+                                  context: context,
+                                  icon: LucideIcons.downloadCloud,
+                                  iconColor: Colors.blue,
+                                  title: 'Export Data to CSV',
+                                  trailing: _isExporting 
+                                      ? const SizedBox(width: 20, height: 20, child: CircularProgressIndicator(strokeWidth: 2))
+                                      : const Icon(LucideIcons.chevronRight, size: 20, color: Colors.grey),
+                                  onTap: _isExporting ? null : _exportData,
+                                ),
+                                _buildDivider(context, isDark),
+                                _buildSettingsTile(
+                                  context: context,
+                                  icon: LucideIcons.palette,
+                                  iconColor: Colors.purple,
+                                  title: 'Appearance',
+                                  trailing: SegmentedButton<ThemeMode>(
+                                    segments: const [
+                                      ButtonSegment(value: ThemeMode.light, icon: Icon(LucideIcons.sun, size: 16)),
+                                      ButtonSegment(value: ThemeMode.system, icon: Icon(LucideIcons.monitor, size: 16)),
+                                      ButtonSegment(value: ThemeMode.dark, icon: Icon(LucideIcons.moon, size: 16)),
+                                    ],
+                                    selected: {themeMode},
+                                    onSelectionChanged: (Set<ThemeMode> newSelection) {
+                                      ref.read(themeProvider.notifier).setTheme(newSelection.first);
+                                    },
+                                    showSelectedIcon: false,
+                                    style: ButtonStyle(
+                                      visualDensity: VisualDensity.compact,
+                                      tapTargetSize: MaterialTapTargetSize.shrinkWrap,
+                                      backgroundColor: WidgetStateProperty.resolveWith<Color?>((states) {
+                                        if (states.contains(WidgetState.selected)) {
+                                          return primaryColor.withOpacity(0.2);
+                                        }
+                                        return null;
+                                      }),
+                                    ),
+                                  ),
+                                ),
+                                _buildDivider(context, isDark),
+                                Consumer(
+                                  builder: (context, ref, child) {
+                                    final isBusinessMode = ref.watch(businessModeProvider);
+                                    return Column(
+                                      children: [
+                                        if (_profileType == 'BUSINESS') ...[
+                                          _buildSwitchTile(
+                                            context: context,
+                                            icon: LucideIcons.briefcase,
+                                            iconColor: Colors.orange,
+                                            title: 'Business Mode',
+                                            subtitle: 'Inventory and Sales Hub',
+                                            value: isBusinessMode,
+                                            onChanged: (val) => ref.read(businessModeProvider.notifier).toggleMode(),
+                                          ),
+                                          if (isBusinessMode) ...[
+                                            _buildDivider(context, isDark),
+                                            _buildSettingsTile(
+                                              context: context,
+                                              icon: LucideIcons.settings2,
+                                              iconColor: Colors.grey.shade600,
+                                              title: 'Business Settings',
+                                              subtitle: 'Configure Taxes, Barcodes, etc.',
+                                              trailing: const Icon(LucideIcons.chevronRight, size: 20, color: Colors.grey),
+                                              onTap: () => Navigator.push(context, MaterialPageRoute(builder: (_) => const BusinessSettingsScreen())),
+                                            ),
+                                          ],
+                                          _buildDivider(context, isDark),
+                                        ],
+                                      ],
+                                    );
+                                  }
+                                ),
+                                _buildDivider(context, isDark),
+                                _buildSettingsTile(
+                                  context: context,
+                                  icon: LucideIcons.helpCircle,
+                                  iconColor: Colors.green,
+                                  title: 'Help & Support',
+                                  trailing: const Icon(LucideIcons.chevronRight, size: 20, color: Colors.grey),
+                                  onTap: () {},
+                                ),
+                              ],
+                            ),
+                          ),
+                        ),
+                      ),
+                      const SizedBox(height: 48),
+                      
+                      // Logout Button
+                      Container(
+                        width: double.infinity,
+                        decoration: BoxDecoration(
+                          borderRadius: BorderRadius.circular(16),
+                          gradient: LinearGradient(
+                            colors: [Colors.red.shade400, Colors.red.shade600],
+                          ),
+                          boxShadow: [
+                            BoxShadow(color: Colors.red.withOpacity(0.3), blurRadius: 15, offset: const Offset(0, 5)),
+                          ],
+                        ),
+                        child: ElevatedButton.icon(
+                          onPressed: () => _logout(context),
+                          style: ElevatedButton.styleFrom(
+                            backgroundColor: Colors.transparent,
+                            foregroundColor: Colors.white,
+                            shadowColor: Colors.transparent,
+                            padding: const EdgeInsets.symmetric(vertical: 20),
+                            shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(16)),
+                          ),
+                          icon: const Icon(LucideIcons.logOut, size: 22),
+                          label: const Text('Log Out', style: TextStyle(fontSize: 16, fontWeight: FontWeight.bold, letterSpacing: 1.0)),
+                        ),
+                      ),
+                      const SizedBox(height: 40),
+                    ],
+                  ),
+                ),
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildSettingsTile({
+    required BuildContext context,
+    required IconData icon,
+    required Color iconColor,
+    required String title,
+    String? subtitle,
+    required Widget trailing,
+    VoidCallback? onTap,
+  }) {
+    final isDark = Theme.of(context).brightness == Brightness.dark;
+    return ListTile(
+      contentPadding: const EdgeInsets.symmetric(horizontal: 20, vertical: 8),
+      leading: Container(
+        padding: const EdgeInsets.all(12),
+        decoration: BoxDecoration(
+          color: iconColor.withOpacity(isDark ? 0.2 : 0.1),
+          borderRadius: BorderRadius.circular(12),
+        ),
+        child: Icon(icon, color: iconColor, size: 24),
+      ),
+      title: Text(title, style: const TextStyle(fontWeight: FontWeight.w600, fontSize: 16)),
+      subtitle: subtitle != null ? Text(subtitle, style: TextStyle(fontSize: 13, color: isDark ? Colors.grey.shade400 : Colors.grey.shade600)) : null,
+      trailing: trailing,
+      onTap: onTap,
+    );
+  }
+
+  Widget _buildSwitchTile({
+    required BuildContext context,
+    required IconData icon,
+    required Color iconColor,
+    required String title,
+    required String subtitle,
+    required bool value,
+    required ValueChanged<bool> onChanged,
+  }) {
+    return _buildSettingsTile(
+      context: context,
+      icon: icon,
+      iconColor: iconColor,
+      title: title,
+      subtitle: subtitle,
+      trailing: Switch(
+        value: value,
+        onChanged: onChanged,
+        activeColor: iconColor,
+      ),
+      onTap: () => onChanged(!value),
+    );
+  }
+
+  Widget _buildDivider(BuildContext context, bool isDark) {
+    return Divider(
+      height: 1,
+      indent: 76,
+      endIndent: 20,
+      color: Theme.of(context).dividerColor.withOpacity(isDark ? 0.1 : 0.05),
     );
   }
 }

kifi-app/lib/features/auth/presentation/setup_wizard_screen.dart

@@ -305,11 +305,12 @@ class _SetupWizardScreenState extends State<SetupWizardScreen> with SingleTicker
         const SizedBox(height: 32),
         DropdownButtonFormField<String>(
           decoration: _buildInputDecoration('Nature of Business *'),
+          dropdownColor: Colors.white,
           value: _natureOfBusiness,
           items: const [
-            DropdownMenuItem(value: 'JEWELLERY', child: Text('Jewellery')),
+            DropdownMenuItem(value: 'JEWELLERY', child: Text('Jewellery', style: TextStyle(color: Colors.black87))),
-            DropdownMenuItem(value: 'PROJECT_MANAGEMENT', child: Text('Project Management')),
+            DropdownMenuItem(value: 'PROJECT_MANAGEMENT', child: Text('Project Management', style: TextStyle(color: Colors.black87))),
-            DropdownMenuItem(value: 'INVENTORY_MANAGEMENT', child: Text('Inventory Management')),
+            DropdownMenuItem(value: 'INVENTORY_MANAGEMENT', child: Text('Inventory Management', style: TextStyle(color: Colors.black87))),
           ],
           onChanged: (val) => setState(() => _natureOfBusiness = val),
         ),

kifi-app/lib/features/business/presentation/hub/business_hub_screen.dart

@@ -5,8 +5,10 @@ import '../../../../core/theme/nature_colors.dart';
 import '../../../inventory/presentation/product_list_screen.dart';
 import '../../../inventory/presentation/quick_adjust_stock_screen.dart';
 import '../../../inventory/presentation/uoms_list_screen.dart';
+import '../../../inventory/presentation/category_management_screen.dart';
 import '../../../sales/presentation/customers_list_screen.dart';
 import '../../../sales/presentation/invoices_list_screen.dart';
+import '../reports/reports_screen.dart';
 import '../../providers/business_provider.dart';
 import '../widgets/business_profile_form_sheet.dart';
 import '../../../inventory/providers/products_provider.dart';
@@ -106,6 +108,14 @@ class BusinessHubScreen extends ConsumerWidget {
                   Colors.purple,
                   () => Navigator.push(context, MaterialPageRoute(builder: (_) => const UomsListScreen())),
                 ),
+                _buildActionCard(
+                  context, 
+                  'Categories', 
+                  'Manage catalog structure', 
+                  LucideIcons.listTree, 
+                  Colors.teal,
+                  () => Navigator.push(context, MaterialPageRoute(builder: (_) => const CategoryManagementScreen())),
+                ),
               ],
               if (showSales) ...[
                 _buildActionCard(
@@ -143,6 +153,14 @@ class BusinessHubScreen extends ConsumerWidget {
                   () => Navigator.push(context, MaterialPageRoute(builder: (_) => const PurchaseOrdersListScreen())),
                 ),
               ],
+              _buildActionCard(
+                context, 
+                'Reports',
+                'Analytics & Valuation',
+                LucideIcons.barChart2,
+                Colors.indigo,
+                () => Navigator.push(context, MaterialPageRoute(builder: (_) => const ReportsScreen())),
+              ),
             ],
           ),
           if (showInventory) ...[

kifi-app/lib/features/business/presentation/reports/reports_screen.dart

@@ -0,0 +1,94 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:lucide_icons/lucide_icons.dart';
+import 'package:intl/intl.dart';
+import '../../../inventory/providers/inventory_valuation_provider.dart';
+
+class ReportsScreen extends ConsumerWidget {
+  const ReportsScreen({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final valuationState = ref.watch(inventoryValuationProvider);
+    final formatCurrency = NumberFormat.currency(symbol: '₹');
+
+    return Scaffold(
+      appBar: AppBar(
+        title: const Text('Business Reports'),
+      ),
+      body: Padding(
+        padding: const EdgeInsets.all(16.0),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.stretch,
+          children: [
+            _buildReportCard(
+              context,
+              title: 'Inventory Valuation Report',
+              icon: LucideIcons.boxes,
+              color: Colors.blue,
+              content: valuationState.when(
+                data: (val) => Text(
+                  'Total Estimated Value: ${formatCurrency.format(val)}',
+                  style: const TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
+                ),
+                loading: () => const CircularProgressIndicator(),
+                error: (e, s) => Text('Error: $e'),
+              ),
+            ),
+            const SizedBox(height: 16),
+            _buildReportCard(
+              context,
+              title: 'GST Report (Coming Soon)',
+              icon: LucideIcons.fileText,
+              color: Colors.orange,
+              content: const Text('Export GSTR-1 & GSTR-3B formats based on invoices.'),
+            ),
+            const SizedBox(height: 16),
+            _buildReportCard(
+              context,
+              title: 'Sales & Revenue (Coming Soon)',
+              icon: LucideIcons.trendingUp,
+              color: Colors.green,
+              content: const Text('Daily and monthly sales analytics.'),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  Widget _buildReportCard(BuildContext context, {
+    required String title,
+    required IconData icon,
+    required Color color,
+    required Widget content,
+  }) {
+    return Card(
+      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(16)),
+      child: Padding(
+        padding: const EdgeInsets.all(16.0),
+        child: Column(
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Row(
+              children: [
+                Container(
+                  padding: const EdgeInsets.all(8),
+                  decoration: BoxDecoration(
+                    color: color.withOpacity(0.1),
+                    borderRadius: BorderRadius.circular(8),
+                  ),
+                  child: Icon(icon, color: color),
+                ),
+                const SizedBox(width: 12),
+                Text(title, style: const TextStyle(fontSize: 16, fontWeight: FontWeight.bold)),
+              ],
+            ),
+            const SizedBox(height: 16),
+            content,
+          ],
+        ),
+      ),
+    );
+  }
+}

kifi-app/lib/features/dashboard/presentation/dashboard_screen.dart

@@ -22,7 +22,7 @@ import '../../sales/domain/invoice.dart';
 import '../../sales/presentation/customers_list_screen.dart';
 import 'widgets/swipeable_account_card.dart';
 import 'widgets/budget_status_card.dart';
-import '../../inventory/presentation/daily_rates_screen.dart';
+
 import 'widgets/upcoming_dues_widget.dart';
 import 'widgets/statistics_tab.dart';
 import '../../../core/widgets/shimmer_loading.dart';
@@ -185,17 +185,6 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
         backgroundColor: Colors.transparent,
         elevation: 0,
         actions: [
-          if (isBusinessMode)
-            IconButton(
-              icon: const Icon(LucideIcons.trendingUp),
-              tooltip: 'Daily Commodity Rates',
-              onPressed: () {
-                Navigator.push(
-                  context,
-                  MaterialPageRoute(builder: (_) => const DailyRatesScreen()),
-                );
-              },
-            ),
           Consumer(
             builder: (context, ref, child) {
               final invitationsState = ref.watch(invitationProvider);
@@ -632,9 +621,6 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
               ),
               ));
 
-          if (isProjectMode) {
-            screens.add(const ProjectHubScreen());
-          }
 
           if (isBusinessMode) {
             screens.add(const BusinessHubScreen());
@@ -668,11 +654,9 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
       ),
       bottomNavigationBar: Builder(
         builder: (context) {
-          final isProjectMode = ref.watch(projectModeProvider);
           final isBusinessMode = ref.watch(businessModeProvider);
           final List<BottomNavigationBarItem> navItems = [];
           navItems.add(const BottomNavigationBarItem(icon: Icon(LucideIcons.home), label: 'Home'));
-          if (isProjectMode) navItems.add(const BottomNavigationBarItem(icon: Icon(LucideIcons.trello), label: 'Projects'));
           if (isBusinessMode) navItems.add(const BottomNavigationBarItem(icon: Icon(LucideIcons.briefcase), label: 'Business'));
           navItems.add(const BottomNavigationBarItem(icon: Icon(LucideIcons.pieChart), label: 'Stats'));
           navItems.add(const BottomNavigationBarItem(icon: Icon(LucideIcons.plusCircle), label: 'Add'));
@@ -682,7 +666,6 @@ class _DashboardScreenState extends ConsumerState<DashboardScreen> {
           int safeIndex = _currentIndex;
           // Adjust _currentIndex for the display of bottom nav bar because of 'Add' button
           int addIdx = 1;
-          if (isProjectMode) addIdx++;
           if (isBusinessMode) addIdx++;
           addIdx++; // For Stats
 

kifi-app/lib/features/inventory/domain/inventory_item.dart

@@ -0,0 +1,79 @@
+class InventoryItem {
+  final int? id;
+  final int? userId;
+  final int? productId;
+  final String? tagNumber;
+  final String? sku;
+  final String? huid;
+  final String? purity;
+  final double? grossWeight;
+  final double? netWeight;
+  final double? stoneWeight;
+  final double? diamondWeight;
+  final double? fineWeight;
+  final double? makingCharges;
+  final String? makingChargeType;
+  final double? purchaseCost;
+  final double? metalCost;
+  final double? stoneCost;
+  final double? certificationCost;
+  final double? tax;
+  final int? vendorId;
+  final int? branchId;
+  final String? purchaseRef;
+  final String? status;
+
+  InventoryItem({
+    this.id,
+    this.userId,
+    this.productId,
+    this.tagNumber,
+    this.sku,
+    this.huid,
+    this.purity,
+    this.grossWeight,
+    this.netWeight,
+    this.stoneWeight,
+    this.diamondWeight,
+    this.fineWeight,
+    this.makingCharges,
+    this.makingChargeType,
+    this.purchaseCost,
+    this.metalCost,
+    this.stoneCost,
+    this.certificationCost,
+    this.tax,
+    this.vendorId,
+    this.branchId,
+    this.purchaseRef,
+    this.status,
+  });
+
+  factory InventoryItem.fromJson(Map<String, dynamic> json) {
+    return InventoryItem(
+      id: json['id'],
+      userId: json['userId'],
+      productId: json['productId'],
+      tagNumber: json['tagNumber'],
+      sku: json['sku'],
+      huid: json['huid'],
+      purity: json['purity'],
+      grossWeight: json['grossWeight']?.toDouble(),
+      netWeight: json['netWeight']?.toDouble(),
+      stoneWeight: json['stoneWeight']?.toDouble(),
+      diamondWeight: json['diamondWeight']?.toDouble(),
+      fineWeight: json['fineWeight']?.toDouble(),
+      makingCharges: json['makingCharges']?.toDouble(),
+      makingChargeType: json['makingChargeType'],
+      purchaseCost: json['purchaseCost']?.toDouble(),
+      metalCost: json['metalCost']?.toDouble(),
+      stoneCost: json['stoneCost']?.toDouble(),
+      certificationCost: json['certificationCost']?.toDouble(),
+      tax: json['tax']?.toDouble(),
+      vendorId: json['vendorId'],
+      branchId: json['branchId'],
+      purchaseRef: json['purchaseRef'],
+      status: json['status'],
+    );
+  }
+}

kifi-app/lib/features/inventory/presentation/add_product_screen.dart

@@ -167,95 +167,6 @@ class _AddProductScreenState extends ConsumerState<AddProductScreen> {
     );
   }
 
-  void _showAddCategoryDialog() {
-    String newCatName = '';
-    bool newCatCommodity = false;
-    double newCatRate = 0;
-    String newCalcMethod = 'UNIT'; // WEIGHT, UNIT, VOLUME
-    String newBaseUnit = 'pcs';
-
-    showDialog(
-      context: context,
-      builder: (context) {
-        return StatefulBuilder(
-          builder: (context, setDialogState) {
-            return AlertDialog(
-              shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(24)),
-              title: const Text('New Category', style: TextStyle(fontWeight: FontWeight.bold)),
-              content: SingleChildScrollView(
-                child: Column(
-                  mainAxisSize: MainAxisSize.min,
-                  children: [
-                    _buildPremiumTextField(
-                      label: 'Category Name', 
-                      onChanged: (val) => newCatName = val,
-                    ),
-                    const SizedBox(height: 16),
-                    SwitchListTile(
-                      contentPadding: EdgeInsets.zero,
-                      title: const Text('Is this a Commodity?'),
-                      subtitle: const Text('Enable for daily rate pricing (e.g. Gold)'),
-                      value: newCatCommodity,
-                      onChanged: (val) => setDialogState(() => newCatCommodity = val),
-                    ),
-                    if (newCatCommodity) ...[
-                      // Replace DropdownButtonFormField with SmartSearchDropdown
-                      SmartSearchDropdown<String>(
-                        hintText: 'Calculation Method',
-                        value: newCalcMethod,
-                        items: const ['UNIT', 'WEIGHT', 'VOLUME'],
-                        itemAsString: (val) => val,
-                        onChanged: (val) => setDialogState(() {
-                          newCalcMethod = val!;
-                          if (val == 'WEIGHT') newBaseUnit = 'gm';
-                          else if (val == 'VOLUME') newBaseUnit = 'liter';
-                          else newBaseUnit = 'pcs';
-                        })
-                      ),
-                      const SizedBox(height: 16),
-                      _buildPremiumTextField(
-                        label: 'Base Unit (e.g. gm, kg, pcs)',
-                        initialValue: newBaseUnit,
-                        onChanged: (val) => newBaseUnit = val,
-                      ),
-                      const SizedBox(height: 16),
-                      _buildPremiumTextField(
-                        label: 'Daily Rate',
-                        prefixText: '₹',
-                        keyboardType: const TextInputType.numberWithOptions(decimal: true),
-                        onChanged: (val) => newCatRate = double.tryParse(val) ?? 0,
-                      ),
-                    ]
-                  ],
-                ),
-              ),
-              actions: [
-                TextButton(onPressed: () => Navigator.pop(context), child: const Text('Cancel')),
-                ElevatedButton(
-                  style: ElevatedButton.styleFrom(
-                    shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(16)),
-                  ),
-                  onPressed: () async {
-                    if (newCatName.trim().isEmpty) return;
-                    final newCategory = ProductCategory(
-                      name: newCatName.trim(),
-                      isCommodity: newCatCommodity,
-                      calculationMethod: newCalcMethod,
-                      baseUnit: newBaseUnit,
-                      dailyRate: newCatCommodity ? newCatRate : null,
-                    );
-                    await ref.read(productCategoriesProvider.notifier).createCategory(newCategory);
-                    if (context.mounted) Navigator.pop(context);
-                  },
-                  child: const Text('Create'),
-                ),
-              ],
-            );
-          },
-        );
-      },
-    );
-  }
 
   Future<void> _save() async {
     if (!_formKey.currentState!.validate()) return;
@@ -305,21 +216,7 @@ class _AddProductScreenState extends ConsumerState<AddProductScreen> {
   }
 
   double _calculateLivePrice() {
-    if (_selectedCategory == null || !_selectedCategory!.isCommodity) return _sellingPrice;
+    return _sellingPrice;
-    double rate = _selectedCategory!.dailyRate ?? 0;
-    double baseVal = (_weight > 0) ? _weight : 1.0;
-    
-    // Base Material Cost = (Base Quantity + Wastage) * Rate * Purity
-    double materialWeight = baseVal + (baseVal * (_wastagePercentage / 100));
-    double materialCost = materialWeight * rate * _purityFactor;
-    
-    // Making Charges
-    double making = 0;
-    if (_makingChargesType == 'FLAT') making = _makingCharges;
-    else if (_makingChargesType == 'PER_UNIT') making = _makingCharges * baseVal;
-    else if (_makingChargesType == 'PERCENTAGE') making = materialCost * (_makingCharges / 100);
-    
-    return materialCost + making;
   }
 
   @override
@@ -475,37 +372,44 @@ class _AddProductScreenState extends ConsumerState<AddProductScreen> {
                         children: [
                           Icon(LucideIcons.alertCircle, color: Colors.orange),
                           SizedBox(width: 12),
-                          Expanded(child: Text('No categories found. Create one to organize your inventory.', style: TextStyle(color: Colors.orange))),
+                          Expanded(child: Text('No categories found. Manage categories in Business Hub.', style: TextStyle(color: Colors.orange))),
                         ],
                       ),
                     )
                   else
-                    // Replace DropdownButtonFormField with SmartSearchDropdown
                     SmartSearchDropdown<ProductCategory>(
                       hintText: 'Select Category*',
                       value: _selectedCategory,
                       items: leafCategories,
-                      itemAsString: (c) {
+                      itemAsString: (c) => c.name,
-                        String displayName = c.name;
+                      itemBuilder: (context, item) {
-                        if (c.parentCategoryId != null) {
+                        // Build full path
-                          final parent = categories.firstWhere((p) => p.id == c.parentCategoryId, orElse: () => c);
+                        List<String> path = [];
-                          displayName = '${parent.name} > ${c.name}';
+                        ProductCategory? current = item;
+                        while (current != null) {
+                          path.insert(0, current.name);
+                          if (current.parentCategoryId != null) {
+                            current = categories.where((p) => p.id == current!.parentCategoryId).firstOrNull;
+                          } else {
+                            current = null;
+                          }
                         }
-                        return displayName;
+                        final pathString = path.join(' -> ');
+
+                        return Padding(
+                          padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 12.0),
+                          child: Column(
+                            crossAxisAlignment: CrossAxisAlignment.start,
+                            children: [
+                              Text(item.name, style: const TextStyle(fontWeight: FontWeight.bold)),
+                              const SizedBox(height: 2),
+                              Text(pathString, style: TextStyle(fontSize: 12, color: Colors.grey.shade600)),
+                            ],
+                          ),
+                        );
                       },
                       onChanged: (val) => setState(() => _selectedCategory = val),
                     ),
-                  const SizedBox(height: 12),
-                  GestureDetector(
-                    onTap: _showAddCategoryDialog,
-                    child: Row(
-                      children: [
-                        Icon(LucideIcons.plusCircle, size: 18, color: Theme.of(context).colorScheme.primary),
-                        const SizedBox(width: 8),
-                        Text('Create New Category', style: TextStyle(color: Theme.of(context).colorScheme.primary, fontWeight: FontWeight.w600)),
-                      ],
-                    ),
-                  ),
                 ],
               );
             },
@@ -552,7 +456,7 @@ class _AddProductScreenState extends ConsumerState<AddProductScreen> {
           const SizedBox(height: 32),
           
           _buildPremiumTextField(
-            label: _selectedCategory?.isCommodity == true ? 'Volume / Weight' : 'Weight', 
+            label: 'Weight', 
             initialValue: _weight == 0 ? '' : _weight.toString(),
             keyboardType: const TextInputType.numberWithOptions(decimal: true),
             onChanged: (val) => setState(() => _weight = double.tryParse(val) ?? 0),
@@ -583,7 +487,7 @@ class _AddProductScreenState extends ConsumerState<AddProductScreen> {
 
   Widget _buildPricingStep() {
     final taxInclusive = ref.watch(businessProfileProvider).value?.taxIncludedInPrice ?? false;
-    final isCommodity = _selectedCategory?.isCommodity ?? false;
+    final isCommodity = false;
     
     return SingleChildScrollView(
       padding: const EdgeInsets.all(24),
@@ -619,8 +523,7 @@ class _AddProductScreenState extends ConsumerState<AddProductScreen> {
                       ),
                     ],
                   ),
-                  const SizedBox(height: 8),
+
-                  Text('Daily Rate: ₹${_selectedCategory!.dailyRate ?? 0} / ${_selectedCategory!.baseUnit}', style: const TextStyle(color: Colors.white70)),
                   if (_autoCalculatePrice) ...[
                     const Divider(color: Colors.white24, height: 32),
                     _buildPremiumTextField(

kifi-app/lib/features/inventory/presentation/category_management_screen.dart

@@ -0,0 +1,105 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import '../providers/product_categories_provider.dart';
+
+class CategoryManagementScreen extends ConsumerStatefulWidget {
+  const CategoryManagementScreen({super.key});
+
+  @override
+  ConsumerState<CategoryManagementScreen> createState() => _CategoryManagementScreenState();
+}
+
+class _CategoryManagementScreenState extends ConsumerState<CategoryManagementScreen> {
+  @override
+  Widget build(BuildContext context) {
+    final categoriesAsync = ref.watch(productCategoriesProvider);
+
+    return Scaffold(
+      appBar: AppBar(
+        title: const Text('Category Management'),
+      ),
+      body: categoriesAsync.when(
+        data: (categories) {
+          // Build category tree
+          final rootCategories = categories.where((c) => c.parentCategoryId == null).toList();
+          return ListView.builder(
+            itemCount: rootCategories.length,
+            itemBuilder: (context, index) {
+              return _buildCategoryTile(rootCategories[index], categories, 0);
+            },
+          );
+        },
+        loading: () => const Center(child: CircularProgressIndicator()),
+        error: (error, stack) => Center(child: Text('Error: $error')),
+      ),
+      floatingActionButton: FloatingActionButton(
+        onPressed: () => _showAddCategoryDialog(null),
+        child: const Icon(Icons.add),
+      ),
+    );
+  }
+
+  Widget _buildCategoryTile(ProductCategory category, List<ProductCategory> allCategories, int depth) {
+    final children = allCategories.where((c) => c.parentCategoryId == category.id).toList();
+    
+    if (children.isEmpty) {
+      return ListTile(
+        contentPadding: EdgeInsets.only(left: 16.0 + (depth * 24.0), right: 16.0),
+        title: Text(category.name),
+        trailing: IconButton(
+          icon: const Icon(Icons.add_circle_outline),
+          onPressed: () => _showAddCategoryDialog(category),
+        ),
+      );
+    }
+
+    return ExpansionTile(
+      tilePadding: EdgeInsets.only(left: 16.0 + (depth * 24.0), right: 16.0),
+      title: Text(category.name),
+      trailing: Row(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          IconButton(
+            icon: const Icon(Icons.add_circle_outline),
+            onPressed: () => _showAddCategoryDialog(category),
+          ),
+          const Icon(Icons.expand_more),
+        ],
+      ),
+      children: children.map((child) => _buildCategoryTile(child, allCategories, depth + 1)).toList(),
+    );
+  }
+
+  void _showAddCategoryDialog(ProductCategory? parent) {
+    final nameController = TextEditingController();
+    showDialog(
+      context: context,
+      builder: (context) => AlertDialog(
+        title: Text(parent == null ? 'Add Root Category' : 'Add Subcategory to ${parent.name}'),
+        content: TextField(
+          controller: nameController,
+          decoration: const InputDecoration(labelText: 'Category Name'),
+        ),
+        actions: [
+          TextButton(
+            onPressed: () => Navigator.pop(context),
+            child: const Text('Cancel'),
+          ),
+          FilledButton(
+            onPressed: () {
+              if (nameController.text.isNotEmpty) {
+                final newCategory = ProductCategory(
+                  name: nameController.text,
+                  parentCategoryId: parent?.id,
+                );
+                ref.read(productCategoriesProvider.notifier).createCategory(newCategory);
+                Navigator.pop(context);
+              }
+            },
+            child: const Text('Save'),
+          ),
+        ],
+      ),
+    );
+  }
+}

kifi-app/lib/features/inventory/presentation/product_list_screen.dart

@@ -6,7 +6,6 @@ import '../providers/products_provider.dart';
 import '../providers/product_categories_provider.dart';
 import 'add_product_screen.dart';
 import 'product_detail_screen.dart';
-import 'daily_rates_screen.dart';
 import '../../../core/network/dio_client.dart';
 import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 
@@ -58,18 +57,6 @@ class _ProductListScreenState extends ConsumerState<ProductListScreen> {
       appBar: AppBar(
         title: const Text('Products Catalog'),
         elevation: 0,
-        actions: [
-          IconButton(
-            icon: const Icon(LucideIcons.trendingUp),
-            tooltip: 'Daily Commodity Rates',
-            onPressed: () {
-              Navigator.push(
-                context,
-                MaterialPageRoute(builder: (_) => const DailyRatesScreen()),
-              );
-            },
-          ),
-        ],
       ),
       body: Column(
           children: [

kifi-app/lib/features/inventory/providers/inventory_items_provider.dart

@@ -0,0 +1,16 @@
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import '../../../core/network/dio_client.dart';
+import '../domain/inventory_item.dart';
+
+final inventoryItemsProvider = FutureProvider<List<InventoryItem>>((ref) async {
+  try {
+    final response = await DioClient().dio.get('/inventory/items');
+    if (response.statusCode == 200) {
+      final List<dynamic> data = response.data;
+      return data.map((json) => InventoryItem.fromJson(json)).toList();
+    }
+    return [];
+  } catch (e) {
+    return [];
+  }
+});

kifi-app/lib/features/inventory/providers/inventory_valuation_provider.dart

@@ -0,0 +1,17 @@
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import '../../../core/network/dio_client.dart';
+
+final inventoryValuationProvider = FutureProvider<double>((ref) async {
+  try {
+    final response = await DioClient().dio.get('/inventory/items/total-value');
+    if (response.statusCode == 200) {
+      if (response.data is num) {
+        return (response.data as num).toDouble();
+      }
+      return double.tryParse(response.data.toString()) ?? 0.0;
+    }
+    return 0.0;
+  } catch (e) {
+    return 0.0;
+  }
+});

kifi-app/lib/features/inventory/providers/product_categories_provider.dart

@@ -7,20 +7,32 @@ class ProductCategory {
   final int? userId;
   final String name;
   final int? parentCategoryId;
-  final bool isCommodity;
+  final bool hasChild;
+  final String? defaultHsn;
+  final double? defaultGst;
+  final bool huidRequired;
+  final double? defaultMakingCharge;
+  final String? makingChargeType;
   final String calculationMethod;
   final String baseUnit;
-  final double? dailyRate;
+  final bool isActive;
+  final int sortOrder;
 
   ProductCategory({
     this.id,
     this.userId,
     required this.name,
     this.parentCategoryId,
-    this.isCommodity = false,
+    this.hasChild = false,
+    this.defaultHsn,
+    this.defaultGst,
+    this.huidRequired = false,
+    this.defaultMakingCharge,
+    this.makingChargeType,
     this.calculationMethod = 'UNIT',
     this.baseUnit = 'pcs',
-    this.dailyRate,
+    this.isActive = true,
+    this.sortOrder = 0,
   });
 
   factory ProductCategory.fromJson(Map<String, dynamic> json) {
@@ -29,10 +41,16 @@ class ProductCategory {
       userId: json['userId'],
       name: json['name'],
       parentCategoryId: json['parentCategoryId'],
-      isCommodity: json['isCommodity'] ?? false,
+      hasChild: json['hasChild'] ?? false,
+      defaultHsn: json['defaultHsn'],
+      defaultGst: (json['defaultGst'] as num?)?.toDouble(),
+      huidRequired: json['huidRequired'] ?? false,
+      defaultMakingCharge: (json['defaultMakingCharge'] as num?)?.toDouble(),
+      makingChargeType: json['makingChargeType'],
       calculationMethod: json['calculationMethod'] ?? 'UNIT',
       baseUnit: json['baseUnit'] ?? 'pcs',
-      dailyRate: (json['dailyRate'] as num?)?.toDouble(),
+      isActive: json['isActive'] ?? true,
+      sortOrder: json['sortOrder'] ?? 0,
     );
   }
 
@@ -42,10 +60,16 @@ class ProductCategory {
       'userId': userId,
       'name': name,
       'parentCategoryId': parentCategoryId,
-      'isCommodity': isCommodity,
+      'hasChild': hasChild,
+      'defaultHsn': defaultHsn,
+      'defaultGst': defaultGst,
+      'huidRequired': huidRequired,
+      'defaultMakingCharge': defaultMakingCharge,
+      'makingChargeType': makingChargeType,
       'calculationMethod': calculationMethod,
       'baseUnit': baseUnit,
-      'dailyRate': dailyRate,
+      'isActive': isActive,
+      'sortOrder': sortOrder,
     };
   }
 }
@@ -77,55 +101,7 @@ class ProductCategoriesNotifier extends AsyncNotifier<List<ProductCategory>> {
     }
   }
 
-  Future<void> updateCategoryRate(int categoryId, double rate) async {
-    try {
-      final category = state.value?.firstWhere((c) => c.id == categoryId);
-      if (category == null) return;
-      
-      final updatedCategory = ProductCategory(
-        id: category.id,
-        userId: category.userId,
-        name: category.name,
-        parentCategoryId: category.parentCategoryId,
-        isCommodity: category.isCommodity,
-        calculationMethod: category.calculationMethod,
-        baseUnit: category.baseUnit,
-        dailyRate: rate,
-      );
-      
-      await DioClient().dio.put(
-        '/inventory/categories/$categoryId',
-        data: updatedCategory.toJson(),
-      );
-      state = AsyncValue.data(await _fetchCategories());
-    } catch (e) {
-      rethrow;
-    }
-  }
 
-  Future<int> syncRates(int categoryId) async {
-    try {
-      final response = await DioClient().dio.post('/inventory/categories/$categoryId/sync-rates');
-      if (response.statusCode == 200 && response.data != null) {
-        return response.data['syncedCount'] ?? 0;
-      }
-      return 0;
-    } catch (e) {
-      rethrow;
-    }
-  }
-
-  Future<List<dynamic>> fetchRateHistory(int categoryId) async {
-    try {
-      final response = await DioClient().dio.get('/inventory/categories/$categoryId/rate-history');
-      if (response.statusCode == 200) {
-        return response.data as List<dynamic>;
-      }
-      return [];
-    } catch (e) {
-      return [];
-    }
-  }
 }
 
 final productCategoriesProvider = AsyncNotifierProvider<ProductCategoriesNotifier, List<ProductCategory>>(() {

kifi-app/lib/features/sales/domain/invoice.dart

@@ -2,6 +2,7 @@ class InvoiceItem {
   final int? id;
   final int? invoiceId;
   final int? productId;
+  final int? inventoryItemId;
   final String? sku;
   final String? hsnCode;
 
@@ -18,6 +19,7 @@ class InvoiceItem {
     this.id,
     this.invoiceId,
     this.productId,
+    this.inventoryItemId,
     this.hsnCode,
     this.sku,
     this.description,
@@ -34,6 +36,7 @@ class InvoiceItem {
     int? id,
     int? invoiceId,
     int? productId,
+    int? inventoryItemId,
     String? hsnCode,
     String? sku,
     String? description,
@@ -49,6 +52,7 @@ class InvoiceItem {
       id: id ?? this.id,
       invoiceId: invoiceId ?? this.invoiceId,
       productId: productId ?? this.productId,
+      inventoryItemId: inventoryItemId ?? this.inventoryItemId,
       hsnCode: hsnCode ?? this.hsnCode,
       sku: sku ?? this.sku,
       description: description ?? this.description,
@@ -67,6 +71,7 @@ class InvoiceItem {
       id: json['id'],
       invoiceId: json['invoiceId'],
       productId: json['productId'],
+      inventoryItemId: json['inventoryItemId'],
       hsnCode: json['hsnCode'] ?? json['hsn_code'],
       sku: json['sku'],
       description: json['description'],
@@ -85,6 +90,7 @@ class InvoiceItem {
     if (id != null) data['id'] = id;
     if (invoiceId != null) data['invoiceId'] = invoiceId;
     if (productId != null) data['productId'] = productId;
+    if (inventoryItemId != null) data['inventoryItemId'] = inventoryItemId;
     if (hsnCode != null) data['hsnCode'] = hsnCode;
     if (sku != null) data['sku'] = sku;
     if (description != null) data['description'] = description;

kifi-app/lib/features/sales/presentation/invoice_builder_screen.dart

@@ -11,8 +11,10 @@ import '../domain/invoice.dart';
 import '../providers/customers_provider.dart';
 import '../domain/customer.dart';
 import '../../inventory/providers/products_provider.dart';
+import '../../inventory/providers/inventory_items_provider.dart';
 import '../../projects/providers/project_mode_provider.dart';
 import '../../inventory/domain/product.dart';
+import '../../inventory/domain/inventory_item.dart';
 import 'add_customer_sheet.dart';
 import '../../transactions/providers/providers.dart';
 
@@ -309,9 +311,49 @@ class _InvoiceBuilderScreenState extends ConsumerState<InvoiceBuilderScreen> {
     );
     if (barcode != null && barcode.isNotEmpty) {
       final products = ref.read(productsProvider).value ?? [];
+      final inventoryItems = ref.read(inventoryItemsProvider).value ?? [];
       final businessFeature = ref.read(businessFeatureProvider).value;
       final bool useBarcodeField = businessFeature?.barcodeSource == 'BARCODE';
 
+      // 1. Try to match by HUID first
+      final invItem = inventoryItems.where((i) => i.huid?.toLowerCase() == barcode.toLowerCase()).firstOrNull;
+
+      if (invItem != null) {
+        final p = products.where((p) => p.id == invItem.productId).firstOrNull;
+        setState(() {
+          final existingIndex = _items.indexWhere((item) => item.inventoryItemId == invItem.id);
+          if (existingIndex >= 0) {
+            // HUIDs are unique, so this shouldn't normally increment qty, but for safety:
+            if (context.mounted) {
+              ScaffoldMessenger.of(context).showSnackBar(const SnackBar(content: Text('Item with this HUID is already in the invoice')));
+            }
+          } else {
+            final price = invItem.purchaseCost ?? p?.sellingPrice ?? 0; // Ideally use selling price logic, but keeping simple
+            final tax = invItem.tax ?? p?.gstRate ?? 0;
+            final making = invItem.makingCharges ?? p?.makingCharges ?? 0;
+            final total = price + (price * (tax / 100)) + making;
+            _items.add(InvoiceItem(
+              productId: p?.id,
+              inventoryItemId: invItem.id,
+              sku: invItem.huid ?? invItem.sku ?? p?.sku,
+              description: p?.name ?? 'Inventory Item',
+              quantity: 1,
+              unitPrice: price,
+              taxRate: tax,
+              makingCharge: making,
+              otherCharges: 0,
+              discount: 0,
+              total: total,
+            ));
+            if (context.mounted) {
+              ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text('Added HUID item to invoice')));
+            }
+          }
+        });
+        return;
+      }
+
+      // 2. Fallback to matching by Product SKU or Barcode
       final p = products.where((p) {
         if (useBarcodeField) {
           return p.barcode?.toLowerCase() == barcode.toLowerCase();
@@ -322,7 +364,7 @@ class _InvoiceBuilderScreenState extends ConsumerState<InvoiceBuilderScreen> {
 
       if (p != null) {
         setState(() {
-          final existingIndex = _items.indexWhere((item) => item.productId == p.id);
+          final existingIndex = _items.indexWhere((item) => item.productId == p.id && item.inventoryItemId == null);
           if (existingIndex >= 0) {
             // Increment qty
             final item = _items[existingIndex];
@@ -354,7 +396,7 @@ class _InvoiceBuilderScreenState extends ConsumerState<InvoiceBuilderScreen> {
         }
       } else {
         if (context.mounted) {
-          ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text('Product not found for barcode: $barcode')));
+          ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text('Product/Item not found for barcode: $barcode')));
         }
       }
     }

kifi_context.md

@@ -1,7 +1,7 @@
 # Kifi Project Context
 
 ## Overview
-Kifi is a financial and inventory management application designed to handle strict accounting principles along with inventory, vendor, and business operations.
+Kifi is a financial and inventory management application designed to handle strict accounting principles along with inventory, vendor, and business operations. It supports a specialized "Jewellery Business Mode".
 
 ### Components
 - **kifi-app**: Flutter mobile frontend.
@@ -11,31 +11,49 @@ Kifi is a financial and inventory management application designed to handle stri
 ## Core Features & Architecture
 
 ### 1. Accounting System
-- **Double-Entry Principle**: Strict double-entry accounting is mandated. Every financial entry must balance. 
+- **Double-Entry Principle**: Strict double-entry accounting is mandated. Every financial entry must balance.
-  - *Example*: Interest/bank fees on a Credit Card are recorded as a transfer: `From: CC -> To: Expense (Bank Charges/Interest)`.
 - **Entities**: The core entities are `Wallet` (which represents all forms of accounts/ledgers) and `Transaction`.
-- **Account Types (Natures)**: Accounts are categorized by `nature` (e.g., SAVINGS, INCOME, EXPENSE, PAYABLES, INVESTMENTS) and further specialized by `sub_nature`.
+- **Account Types (Natures)**: Accounts are categorized by `nature` (e.g., SAVINGS, INCOME, EXPENSE, PAYABLES, INVESTMENTS).
-- **Payables**: Specialized support for Credit Cards, Overdrafts (OD), EMIs, and Policy Premiums. Features configurable cycle dates, credit limits, and fixed amounts for recurring dues.
+- **Payables**: Specialized support for Credit Cards, OD, EMIs, and Policy Premiums. Features configurable cycle dates and limits.
-- **Dashboard**: Features an `UpcomingDuesWidget` that proactively calculates and displays urgent dues based on cycle dates and negative balances.
+- **Automated Ledger Mapping (`LedgerService`)**: 
+  - **Purchases**: Receiving a PO automatically debits `Inventory Asset` and credits the specific `Vendor Payable` wallet.
+  - **Sales**: Finalizing an Invoice automatically debits `Customer AR` and credits `Sales Revenue`.
+  - Wallets act as formal Chart of Accounts (COA) ledgers generated automatically on demand.
 
-### 2. Inventory Management
+### 2. Jewellery & Inventory Management
-- Supports Products, Categories, Unit of Measure (UOM), and Bills of Material (BOM).
+- **Jewellery Business Mode**: When `BUSINESS` and `JEWELLERY` are selected, Kifi transitions into a robust jewellery ERP.
-- Product pricing can follow auto-calculated rules.
+- **Inventory Model**: 
-- Images are uploaded as Multipart form data, converted to Base64 in the backend, and sent to MinIO.
+  - `Product` represents the master catalog definition (e.g., 22K Gold Ladies Ring).
+  - `InventoryItem` represents physical tags in the store. Each item is unique, storing exact gross/net/stone/fine weights, individual purchase costs, vendor reference, and uniquely tracking items via **HUID** or Barcode. HUID uniqueness forces 1:1 material tracking for those categories.
+- **Commodity Rates**: Commodity rates (e.g. Gold/Silver prices) are **immutable and append-only**. 
+  - System syncs rates to `CommodityRateHistory`.
+  - Rate synchronization NEVER overwrites the historical purchase cost or pre-calculated selling prices of individual `InventoryItem` records. Valuations are calculated dynamically at runtime when needed.
+- **Dynamic Valuation**: `InventoryValuationService` calculates real-time inventory value by multiplying available fine weight by the latest `CommodityRateHistory` rate, adding making charges, and rendering it instantly on the Business Dashboard via a riverpod provider.
 
 ### 3. Vendor & Purchase Orders
-- Active development on Vendor Management, Purchase Orders, and Purchase Payments. 
+- Purchase Orders map to Vendors.
+- Receiving a Purchase Order creates individual `InventoryItem` tags representing real physical stock (e.g. individual chains, rings) rather than simply bumping aggregate product stock totals.
 
-### 4. Project Management (Tasks)
+### 4. Customer & Sales/Invoice Module
+- **Invoice to Inventory Linking**: `InvoiceItem` records map directly to specific physical `InventoryItem` tags (`inventory_item_id`) rather than just master products.
+- **HUID Barcode Scanning**: The `InvoiceBuilderScreen` scans and prioritizes mapping directly to a unique HUID from `InventoryItem`. This natively prevents duplicating unique items in the same invoice. 
+- **Stock Deduction**: Finalizing an invoice or creating a non-draft invoice automatically marks the referenced `InventoryItem` records as `SOLD`.
+- Financial breakdown fields (`making_charge`, `other_charges`, `hsn_code`) are captured at the item level.
+
+### 5. Reporting & Audit Module
+- **Reports Hub**: Accessible from the Business Hub, features live tracking of Real-time Inventory Valuation.
+
+### 5. Project Management (Tasks)
 - Supports full Project creation, task assignment, and billing rates.
-- **Task Comments & Attachments**: Task comments support both legacy Base64 attachments (stored in PostgreSQL) and newer MinIO-backed attachments. Native downloading and sharing of non-image files (PDFs, Docs) is implemented via `file_picker` and `share_plus`. Images utilize a full-screen zoomable gallery.
+- **Task Comments & Attachments**: Task comments support both legacy Base64 attachments (stored in PostgreSQL) and newer MinIO-backed attachments.
 
-### 5. UI Standardization
+### 6. UI Standardization
 - **Design System**: The application strictly adheres to a uniform, enterprise-grade design system across all list screens (Projects, Invoices, Vendors, Task Board). 
-- **Standard Themes**: `Colors.grey[100]` is the standard background color, and search fields use white containers with rounded corners and no borders. The `CustomersScreen` serves as the UI source of truth.
+- **Material 3 / UI-UX Rules**: UI components avoid generic Material layouts, utilizing dynamic modern aesthetics, dynamic profile avatars, and proper padding/borders. 
+- **Standard Themes**: `Colors.grey[100]` is the standard background color, and search fields use white containers with rounded corners and no borders.
 
 ## Important Technical Rules & Conventions
-1. **R2DBC Limitations**: Because R2DBC is fully reactive, it does not automatically fetch relations (no lazy loading like Hibernate). Transient relational fields (e.g. `@Transient List<ProductImage> images` in `Product`) MUST be manually populated in the Service layers using `Mono.zip` or `flatMap` before returning to the controller.
+1. **R2DBC Limitations**: Because R2DBC is fully reactive, it does not automatically fetch relations (no lazy loading). Transient relational fields MUST be manually populated in the Service layers using `Mono.zip` or `flatMap` before returning to the controller.
-2. **API Routing (kifi vs kifi-v2)**: The application is migrating to a new reactive backend. New endpoints are mapped under `/api/kifi-v2/` (e.g., `/api/kifi-v2/inventory/products`), while some legacy mobile integrations might still point to `/api/kifi/` (e.g., transactions). Pay close attention to Base URL configurations in `DioClient` vs hardcoded URLs in UI widgets.
+2. **API Routing (kifi vs kifi-v2)**: The application is migrating to a new reactive backend. New endpoints are mapped under `/api/kifi-v2/`.
 3. **Payload Limits**: `spring.codec.max-in-memory-size` is set to `10MB` in `application.yml` to prevent `DataBufferLimitException` when handling large image uploads/downloads.
-4. **Image/Attachment Loading**: The backend reads byte buffers from MinIO (Base64) and decodes them to byte arrays (`byte[]`) to serve over HTTP. Flutter uses `Image.network` (or `NetworkImage`) with Bearer tokens in headers to fetch these secured endpoints.
+4. **Image/Attachment Loading**: The backend reads byte buffers from MinIO (Base64) and decodes them to byte arrays (`byte[]`) to serve over HTTP.