Implement merchant management features and document handling

.gitignore

@@ -1,3 +1,8 @@
 #ignoring the enviroment
 .env
-.unknown
+.unknown
+
+storage/*
+!storage/.gitkeep
+storage/**/*
+!storage/**/.gitkeep

backend/cmd/app/main.go

@@ -68,11 +68,17 @@ func main() {
 	fileServer := http.FileServer(http.Dir("./frontend/assets"))
 	mux.Handle("/assets/", http.StripPrefix("/assets/", fileServer))
 
+	// Serve storage directory for uploaded documents and images (locally stored)
+	storageServer := http.FileServer(http.Dir("./storage"))
+	mux.Handle("/storage/", http.StripPrefix("/storage/", storageServer))
+
 	// general endpoints
 	mux.HandleFunc("GET /login", authHandler.LoginView)
 	mux.HandleFunc("GET /signup", authHandler.SignupView)
 	mux.HandleFunc("POST /v1/loginauth", authHandler.LoginAuthHandler) // Login authentication endpoint
 	mux.HandleFunc("POST /v1/signupauth", authHandler.SignupHandler)
+	mux.HandleFunc("GET /merchant-signup", authHandler.MerchantSignupView)
+	mux.HandleFunc("POST /v1/merchant-signup", authHandler.MerchantSignupHandler)
 	mux.HandleFunc("GET /admin-signup", authHandler.AdminSignupView)
 	mux.HandleFunc("POST /v1/admin-signup", authHandler.AdminSignupHandler)
 	mux.HandleFunc("POST /v1/signup/check-details", authHandler.CheckDetailsHandler)
@@ -102,8 +108,15 @@ func main() {
 	mux.HandleFunc("POST /v1/admin/{username}/terminals/add", adminHanlder.AddTerminalHandler)
 	mux.HandleFunc("GET /admin/{username}/settings", adminHanlder.SystemSettingsView)
 	mux.HandleFunc("POST /v1/admin/{username}/merchants/add", adminHanlder.AddMerchantHandler)
+	mux.HandleFunc("GET /admin/{username}/merchants/{id}", adminHanlder.MerchantInfoView)
+	mux.HandleFunc("GET /v1/admin/{username}/merchants/{id}/data", adminHanlder.MerchantInfoDataHandler)
+	mux.HandleFunc("POST /v1/admin/{username}/merchants/{id}/approve", adminHanlder.ApproveMerchantHandler)
+	mux.HandleFunc("POST /v1/admin/{username}/merchants/{id}/reject", adminHanlder.RejectMerchantHandler)
+	mux.HandleFunc("POST /v1/admin/{username}/merchants/{id}/suspend", adminHanlder.SuspendMerchantHandler)
+	mux.HandleFunc("DELETE /v1/admin/{username}/merchants/{id}/delete", adminHanlder.DeleteMerchantHandler)
 	mux.HandleFunc("GET /admin/{username}/card-inventory", adminHanlder.CardInventoryView)
 	mux.HandleFunc("GET /v1/admin/{username}/card-inventory-data", adminHanlder.CardInventoryDataHandler)
+	mux.HandleFunc("POST /v1/admin/{username}/cards/{id}/block", adminHanlder.BlockCardHandler)
 	mux.HandleFunc("GET /admin/{username}/addcard", adminHanlder.AddCardsView)
 	mux.HandleFunc("GET /admin/{username}/deactivatecard", adminHanlder.DeactivateView)
 	mux.HandleFunc("POST /v1/admin/{username}/addcardauth", adminHanlder.AddCardHandler)

backend/internal/admin/admin_dashboard.go

@@ -96,35 +96,46 @@ func (h *Handler) AdminDashboardDataHandler(w http.ResponseWriter, r *http.Reque
 	}
 	log.Println("Total cards row:", totalCards)
 
-	// Display the number of merchants
-	// Counting only 'active' merchants (excluding 'pending_approval' or 'suspended')
-	row = h.DB.QueryRow("SELECT COUNT(*) FROM merchants WHERE status = 'active'")
-
-	var totalMerchants int
-	if err := row.Scan(&totalMerchants); err != nil {
-		log.Println("Error scanning total merchants:", err)
+	// Display the number of merchants and breakdown
+	row = h.DB.QueryRow(`
+		SELECT 
+			COUNT(*),
+			COALESCE(SUM(CASE WHEN status = 'pending_approval' THEN 1 ELSE 0 END), 0),
+			COALESCE(SUM(CASE WHEN status = 'suspended' THEN 1 ELSE 0 END), 0),
+			COALESCE(SUM(CASE WHEN status = 'rejected' THEN 1 ELSE 0 END), 0)
+		FROM merchants
+	`)
+
+	var totalMerchants, pendingMerchants, suspendedMerchants, rejectedMerchants int
+	if err := row.Scan(&totalMerchants, &pendingMerchants, &suspendedMerchants, &rejectedMerchants); err != nil {
+		log.Println("Error scanning merchants stats:", err)
 		jsonwrite.WriteJSON(w, http.StatusInternalServerError, jsonwrite.APIResponse{
 			Success: false,
 			Message: "Internal server error",
 		})
 		return
 	}
-	log.Println("Total merchants row:", totalMerchants)
-
-	// Display the number of terminals
-	// Counting 'active' ESP32 nodes (excluding 'offline' or 'suspended')
-	row = h.DB.QueryRow("SELECT COUNT(*) FROM terminals WHERE status = 'active'")
-
-	var totalTerminals int
-	if err := row.Scan(&totalTerminals); err != nil {
-		log.Println("Error scanning total terminals:", err)
+	log.Println("Total merchants:", totalMerchants, "Pending:", pendingMerchants)
+
+	// Display the number of terminals and breakdown
+	row = h.DB.QueryRow(`
+		SELECT 
+			COUNT(*),
+			COALESCE(SUM(CASE WHEN status = 'active' THEN 1 ELSE 0 END), 0),
+			COALESCE(SUM(CASE WHEN status = 'inactive' THEN 1 ELSE 0 END), 0)
+		FROM terminals
+	`)
+
+	var totalTerminals, activeTerminals, inactiveTerminals int
+	if err := row.Scan(&totalTerminals, &activeTerminals, &inactiveTerminals); err != nil {
+		log.Println("Error scanning terminals stats:", err)
 		jsonwrite.WriteJSON(w, http.StatusInternalServerError, jsonwrite.APIResponse{
 			Success: false,
 			Message: "Internal server error",
 		})
 		return
 	}
-	log.Println("Total terminals row:", totalTerminals)
+	log.Println("Total terminals:", totalTerminals, "Active:", activeTerminals, "Inactive:", inactiveTerminals)
 
 	// Fetch recent merchants for the table (limit 5)
 	merchantQuery := "SELECT merchant_id, business_name, business_type, owner_name, business_email, business_phone, status, created_at FROM merchants ORDER BY created_at DESC LIMIT 5"
@@ -151,13 +162,18 @@ func (h *Handler) AdminDashboardDataHandler(w http.ResponseWriter, r *http.Reque
 
 	// Return the data as JSON
 	response := structs.AdminDashboardData{
-		GrossRevenue:    grossRevenue,
-		NetRevenue:      netRevenue,
-		TotalUsers:      totalUsers,
-		TotalCards:      totalCards,
-		ActiveMerchants: totalMerchants,
-		ActiveTerminals: totalTerminals,
-		Merchants:       merchants,
+		GrossRevenue:       grossRevenue,
+		NetRevenue:         netRevenue,
+		TotalUsers:         totalUsers,
+		TotalCards:         totalCards,
+		TotalMerchants:     totalMerchants,
+		PendingMerchants:   pendingMerchants,
+		SuspendedMerchants: suspendedMerchants,
+		RejectedMerchants:  rejectedMerchants,
+		TotalTerminals:     totalTerminals,
+		ActiveTerminals:    activeTerminals,
+		InactiveTerminals:  inactiveTerminals,
+		Merchants:          merchants,
 	}
 	jsonwrite.WriteJSON(w, http.StatusOK, jsonwrite.APIResponse{
 		Success: true,