Client ID: ` + strconv.FormatInt(client.ClientID, 10) + `
Phone: ` + client.Phone + `
Email: ` + client.Email + `
Address: ` + client.Address + `
@@ -110,7 +124,7 @@ func ViewClient(w http.ResponseWriter, r *http.Request) { } func UpdateClient(w http.ResponseWriter, r *http.Request) { - id, _ := strconv.ParseInt(chi.URLParam(r, "id"), 10) + id, _ := strconv.ParseInt(chi.URLParam(r, "id"), 10, 64) r.ParseForm() client := db.Client{ ClientID: id, @@ -126,12 +140,11 @@ func UpdateClient(w http.ResponseWriter, r *http.Request) { return } - w.Header().Set("Content-Type", "application/json") - json.NewEncoder(w).Encode(client) + w.Header().Set("HX-Refresh", "true") } func DeleteClient(w http.ResponseWriter, r *http.Request) { - id, _ := strconv.ParseInt(chi.URLParam(r, "id"), 10) + id, _ := strconv.ParseInt(chi.URLParam(r, "id"), 10, 64) if err := (&db.Client{}).Delete(DB, id); err != nil { http.Error(w, err.Error(), http.StatusBadRequest) return diff --git a/apps/go-crm/internal/handlers/customers.go b/apps/go-crm/internal/handlers/customers.go index a690a90..97360a1 100644 --- a/apps/go-crm/internal/handlers/customers.go +++ b/apps/go-crm/internal/handlers/customers.go @@ -1,8 +1,6 @@ package handlers import ( - "database/sql" - "encoding/json" "net/http" "strconv" "time" @@ -26,10 +24,21 @@ func ListCustomers(w http.ResponseWriter, r *http.Request) { return } + clients, err := db.ListClients(DB, limit, offset) + if err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + + var clientOptions string + for _, c := range clients { + clientOptions += `` + } + w.Header().Set("Content-Type", "text/html") - w.Write([]byte(`| Name | Phone | Birth Date | Actions |
|---|
| Name | Phone | Birth Date | Actions | |
|---|---|---|---|---|
| ` + c.Name + ` | ` + c.Phone + ` | ` + c.BirthDate + ` | ` + c.Instagram + ` | View |
| ` + c.Name + ` | ` + c.Phone + ` | ` + c.BirthDate + ` | ` + c.Instagram + ` | View |
| Customer | Amount | Paid | Date | Method | Actions |
|---|
| Client | Customer | Amount | Paid | Date | Method | Actions |
|---|---|---|---|---|---|---|
| ` + strconv.FormatInt(p.CustomerID, 10) + ` | ` + strconv.FormatFloat(p.Amount, 'f', 2, 64) + ` | ` + paid + ` | ` + p.PaymentDate + ` | ` + p.PaymentMethod + ` | View | |
| ` + clientName + ` | ` + customerName + ` | ` + strconv.FormatFloat(p.Amount, 'f', 2, 64) + ` | ` + paid + ` | ` + p.PaymentDate + ` | ` + p.PaymentMethod + ` | View |
Amount: ` + strconv.FormatFloat(p.Amount, 'f', 2, 64) + `
Paid: ` + strconv.FormatBool(p.HasPaid) + `
Method: ` + p.PaymentMethod + `
Back`)) } -func UpdatePayment(w http.ResponseWriter, r *http.Request) {} +func UpdatePayment(w http.ResponseWriter, r *http.Request) { + id, _ := strconv.ParseInt(chi.URLParam(r, "id"), 10, 64) + r.ParseForm() + clientID, _ := strconv.ParseInt(r.FormValue("client_id"), 10, 64) + customerID, _ := strconv.ParseInt(r.FormValue("customer_id"), 10, 64) + amount, _ := strconv.ParseFloat(r.FormValue("amount"), 64) + hasPaid := r.FormValue("has_paid") == "on" + _, err := DB.Exec("UPDATE payments SET client_id=?, customer_id=?, has_paid=?, amount=?, payment_date=?, payment_method=? WHERE payment_id=?", clientID, customerID, hasPaid, amount, r.FormValue("payment_date"), r.FormValue("payment_method"), id) + if err != nil { + http.Error(w, err.Error(), http.StatusBadRequest) + return + } + w.Header().Set("HX-Refresh", "true") +} -func DeletePayment(w http.ResponseWriter, r *http.Request) {} +func DeletePayment(w http.ResponseWriter, r *http.Request) { + id, _ := strconv.ParseInt(r.URL.Query().Get("id"), 10, 64) + DB.Exec("DELETE FROM payments WHERE payment_id = ?", id) +} func boolToStr(b bool) string { if b { diff --git a/apps/go-crm/internal/handlers/questions.go b/apps/go-crm/internal/handlers/questions.go index d88911a..d2d4185 100644 --- a/apps/go-crm/internal/handlers/questions.go +++ b/apps/go-crm/internal/handlers/questions.go @@ -6,6 +6,8 @@ import ( "time" "go-crm/internal/db" + + "github.com/go-chi/chi/v5" ) func ListQuestions(w http.ResponseWriter, r *http.Request) { @@ -22,10 +24,42 @@ func ListQuestions(w http.ResponseWriter, r *http.Request) { return } + clients, err := db.ListClients(DB, limit, offset) + if err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + + customers, err := db.ListCustomers(DB, clientID, limit, offset) + if err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + + var clientOptions, customerOptions string + clientNames := make(map[int64]string) + customerNames := make(map[int64]string) + for _, c := range clients { + clientOptions += `` + clientNames[c.ClientID] = c.Name + } + for _, cu := range customers { + customerOptions += `` + customerNames[cu.CustomerID] = cu.Name + } + w.Header().Set("Content-Type", "text/html") - w.Write([]byte(`| Customer | Question | Status | Actions |
|---|
| Client | Customer | Question | Status | Actions |
|---|---|---|---|---|
| ` + strconv.FormatInt(q.CustomerID, 10) + ` | ` + q.Question + ` | ` + q.Status + ` | View | |
| ` + clientName + ` | ` + customerName + ` | ` + q.Question + ` | ` + q.Status + ` | View |
Client ID: ` + strconv.FormatInt(q.ClientID, 10) + `
Customer ID: ` + strconv.FormatInt(q.CustomerID, 10) + `
Question: ` + q.Question + `
Status: ` + q.Status + `
Back`)) } -func UpdateQuestion(w http.ResponseWriter, r *http.Request) {} +func UpdateQuestion(w http.ResponseWriter, r *http.Request) { + id, _ := strconv.ParseInt(chi.URLParam(r, "id"), 10, 64) + r.ParseForm() + clientID, _ := strconv.ParseInt(r.FormValue("client_id"), 10, 64) + customerID, _ := strconv.ParseInt(r.FormValue("customer_id"), 10, 64) + _, err := DB.Exec("UPDATE questions SET client_id=?, customer_id=?, question=?, status=? WHERE question_id=?", clientID, customerID, r.FormValue("question"), r.FormValue("status"), id) + if err != nil { + http.Error(w, err.Error(), http.StatusBadRequest) + return + } + w.Header().Set("HX-Refresh", "true") +} -func DeleteQuestion(w http.ResponseWriter, r *http.Request) {} +func DeleteQuestion(w http.ResponseWriter, r *http.Request) { + id, _ := strconv.ParseInt(chi.URLParam(r, "id"), 10, 64) + DB.Exec("DELETE FROM questions WHERE question_id = ?", id) +} func ListAnswers(w http.ResponseWriter, r *http.Request) { limit, _ := strconv.Atoi(r.URL.Query().Get("limit")) @@ -68,31 +124,123 @@ func ListAnswers(w http.ResponseWriter, r *http.Request) { limit = 20 } - answers, err := db.ListAnswers(DB, questionID, limit, offset) + answers, err := db.ListAnswersWithDetails(DB, questionID, limit, offset) if err != nil { http.Error(w, err.Error(), http.StatusInternalServerError) return } - w.Header().Set("Content-Type", "text/html") - w.Write([]byte(`| Question | Answer | Status | Actions |
|---|---|---|---|
| ` + strconv.FormatInt(a.QuestionID, 10) + ` | ` + a.Answer + ` | ` + a.Status + ` | View |
| Client | Customer | Question | Answer | Status | Actions |
|---|---|---|---|---|---|
| ` + clientName + ` | +` + customerName + ` | +` + qText + ` | +` + a.Answer + ` | +` + a.Status + ` | ++ View + + + | +
Question ID: ` + strconv.FormatInt(a.QuestionID, 10) + `
Answer: ` + a.Answer + `
Back`)) } -func UpdateAnswer(w http.ResponseWriter, r *http.Request) {} +func UpdateAnswer(w http.ResponseWriter, r *http.Request) { + id, _ := strconv.ParseInt(chi.URLParam(r, "id"), 10, 64) + r.ParseForm() + questionID, _ := strconv.ParseInt(r.FormValue("question_id"), 10, 64) + _, err := DB.Exec("UPDATE answers SET question_id=?, answer=? WHERE answer_id=?", questionID, r.FormValue("answer"), id) + if err != nil { + http.Error(w, err.Error(), http.StatusBadRequest) + return + } + w.Header().Set("HX-Refresh", "true") +} -func DeleteAnswer(w http.ResponseWriter, r *http.Request) {} \ No newline at end of file +func DeleteAnswer(w http.ResponseWriter, r *http.Request) { + id, _ := strconv.ParseInt(chi.URLParam(r, "id"), 10, 64) + DB.Exec("DELETE FROM answers WHERE answer_id = ?", id) +} \ No newline at end of file diff --git a/apps/go-crm/internal/handlers/scheduling.go b/apps/go-crm/internal/handlers/scheduling.go index 38aff52..96e07d9 100644 --- a/apps/go-crm/internal/handlers/scheduling.go +++ b/apps/go-crm/internal/handlers/scheduling.go @@ -1,7 +1,6 @@ package handlers import ( - "database/sql" "net/http" "strconv" "time" @@ -26,27 +25,74 @@ func ListSchedules(w http.ResponseWriter, r *http.Request) { return } + clients, err := db.ListClients(DB, limit, offset) + if err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + + customers, err := db.ListCustomers(DB, clientID, limit, offset) + if err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + + services, err := db.ListServices(DB, clientID, limit, offset) + if err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + + var clientOptions, customerOptions, serviceOptions string + clientNames := make(map[int64]string) + customerNames := make(map[int64]string) + serviceNames := make(map[int64]string) + for _, c := range clients { + clientOptions += `` + clientNames[c.ClientID] = c.Name + } + for _, cu := range customers { + customerOptions += `` + customerNames[cu.CustomerID] = cu.Name + } + for _, s := range services { + serviceOptions += `` + serviceNames[s.ServiceID] = s.Name + } + w.Header().Set("Content-Type", "text/html") - w.Write([]byte(`| Customer | Date | Time | Status | Actions |
|---|
| Client | Customer | Service | Date | Hour | Status | Actions |
|---|---|---|---|---|---|---|
| ` + strconv.FormatInt(s.CustomerID, 10) + ` | ` + s.PlanDate + ` | ` + s.Time + ` | ` + s.Status + ` | View | ||
| ` + clientName + ` | ` + customerName + ` | ` + serviceName + ` | ` + s.PlanDate + ` | ` + s.Time + ` | ` + s.Status + ` | View |
Customer ID: ` + strconv.FormatInt(sch.CustomerID, 10) + `
Date: ` + sch.PlanDate + `
Time: ` + sch.Time + `
Status: ` + sch.Status + `
Back`)) + w.Write([]byte(`Client ID: ` + strconv.FormatInt(sch.ClientID, 10) + `
Customer ID: ` + strconv.FormatInt(sch.CustomerID, 10) + `
Service ID: ` + strconv.FormatInt(sch.ServiceID, 10) + `
Date: ` + sch.PlanDate + `
Time: ` + sch.Time + `
Status: ` + sch.Status + `
Back`)) } func UpdateSchedule(w http.ResponseWriter, r *http.Request) { - id, _ := strconv.ParseInt(chi.URLParam(r, "id"), 10) + id, _ := strconv.ParseInt(chi.URLParam(r, "id"), 10, 64) r.ParseForm() - customerID, _ := strconv.ParseInt(r.FormValue("customer_id"), 10, 64) clientID, _ := strconv.ParseInt(r.FormValue("client_id"), 10, 64) - DB.Exec("UPDATE scheduling SET customer_id=?, client_id=?, plan_date=?, confirmed_date=?, time=?, status=?, notes=? WHERE schedule_id=?", customerID, clientID, r.FormValue("plan_date"), r.FormValue("confirmed_date"), r.FormValue("time"), r.FormValue("status"), r.FormValue("notes"), id) + customerID, _ := strconv.ParseInt(r.FormValue("customer_id"), 10, 64) + serviceID, _ := strconv.ParseInt(r.FormValue("service_id"), 10, 64) + _, err := DB.Exec("UPDATE scheduling SET client_id=?, customer_id=?, service_id=?, plan_date=?, time=?, status=? WHERE schedule_id=?", clientID, customerID, serviceID, r.FormValue("plan_date"), r.FormValue("time"), r.FormValue("status"), id) + if err != nil { + http.Error(w, err.Error(), http.StatusBadRequest) + return + } + w.Header().Set("HX-Refresh", "true") } func DeleteSchedule(w http.ResponseWriter, r *http.Request) { - id, _ := strconv.ParseInt(chi.URLParam(r, "id"), 10) + id, _ := strconv.ParseInt(chi.URLParam(r, "id"), 10, 64) DB.Exec("DELETE FROM scheduling WHERE schedule_id = ?", id) } \ No newline at end of file diff --git a/apps/go-crm/internal/handlers/services.go b/apps/go-crm/internal/handlers/services.go index 914d6b8..309a3a4 100644 --- a/apps/go-crm/internal/handlers/services.go +++ b/apps/go-crm/internal/handlers/services.go @@ -1,7 +1,6 @@ package handlers import ( - "database/sql" "net/http" "strconv" "time" @@ -25,10 +24,21 @@ func ListServices(w http.ResponseWriter, r *http.Request) { return } + clients, err := db.ListClients(DB, limit, offset) + if err != nil { + http.Error(w, err.Error(), http.StatusInternalServerError) + return + } + + var clientOptions string + for _, c := range clients { + clientOptions += `` + } + w.Header().Set("Content-Type", "text/html") - w.Write([]byte(`| Name | Price | Duration | Actions |
|---|
| Name | Price | Duration | Actions |
|---|---|---|---|
| ` + s.Name + ` | ` + strconv.FormatFloat(s.Price, 'f', 2, 64) + ` | ` + s.Duration + ` | View |
| ` + s.Name + ` | ` + strconv.FormatFloat(s.Price, 'f', 2, 64) + ` | ` + s.Duration + ` | View |