diff --git a/go/cmd/server/main.go b/go/cmd/server/main.go index 7cad78a2..7d98c1ee 100644 --- a/go/cmd/server/main.go +++ b/go/cmd/server/main.go @@ -82,13 +82,13 @@ func main() { goRouter.HandleFunc("/attachments/{id}", attachmentHandler.Get).Methods("GET") goRouter.HandleFunc("/attachments/{id}", attachmentHandler.Delete).Methods("DELETE") - // PDF generation routes - goRouter.HandleFunc("/pdf/generate-invoice", handlers.GenerateInvoicePDF).Methods("POST") - goRouter.HandleFunc("/pdf/generate-quote", handlers.GenerateQuotePDF).Methods("POST") - goRouter.HandleFunc("/pdf/generate-po", handlers.GeneratePurchaseOrderPDF).Methods("POST") - goRouter.HandleFunc("/pdf/generate-packinglist", handlers.GeneratePackingListPDF).Methods("POST") - goRouter.HandleFunc("/pdf/generate-orderack", handlers.GenerateOrderAckPDF).Methods("POST") - goRouter.HandleFunc("/pdf/count-pages", handlers.CountPages).Methods("POST") + // PDF generation routes (under /api/pdf/* to avoid conflict with file server) + goRouter.HandleFunc("/api/pdf/generate-invoice", handlers.GenerateInvoicePDF).Methods("POST") + goRouter.HandleFunc("/api/pdf/generate-quote", handlers.GenerateQuotePDF).Methods("POST") + goRouter.HandleFunc("/api/pdf/generate-po", handlers.GeneratePurchaseOrderPDF).Methods("POST") + goRouter.HandleFunc("/api/pdf/generate-packinglist", handlers.GeneratePackingListPDF).Methods("POST") + goRouter.HandleFunc("/api/pdf/generate-orderack", handlers.GenerateOrderAckPDF).Methods("POST") + goRouter.HandleFunc("/api/pdf/count-pages", handlers.CountPages).Methods("POST") // Serve generated PDFs pdfDir := os.Getenv("PDF_OUTPUT_DIR") diff --git a/go/internal/cmc/pdf/generator.go b/go/internal/cmc/pdf/generator.go index bbfd92d3..1cf27170 100644 --- a/go/internal/cmc/pdf/generator.go +++ b/go/internal/cmc/pdf/generator.go @@ -331,7 +331,6 @@ func (g *Generator) AddQuoteDetailsTable(data *QuotePDFData) { // Set column widths for a 3-column table colWidth := 50.0 - colY := g.pdf.GetY() // Row 1: Delivery Time | Payment Terms | Days Valid g.pdf.SetX(15) diff --git a/php/app/views/documents/pdf_invoice.ctp b/php/app/views/documents/pdf_invoice.ctp index 67ddb474..4ddd6618 100755 --- a/php/app/views/documents/pdf_invoice.ctp +++ b/php/app/views/documents/pdf_invoice.ctp @@ -2,7 +2,7 @@ // Generate the Invoice PDF by calling the Go service instead of TCPDF. $goBaseUrl = AppController::getGoBaseUrlOrFail(); -$goEndpoint = $goBaseUrl . '/go/pdf/generate-invoice'; +$goEndpoint = $goBaseUrl . '/go/api/pdf/generate-invoice'; $outputDir = Configure::read('pdf_directory'); @@ -70,9 +70,13 @@ $curlErr = curl_error($ch); curl_close($ch); if ($httpCode < 200 || $httpCode >= 300) { - echo "

Failed to generate PDF via Go service (HTTP $httpCode)."; + echo "

Failed to generate PDF via Go service (HTTP $httpCode).
"; + echo "Endpoint: " . htmlspecialchars($goEndpoint) . "
"; if ($curlErr) { - echo " Error: $curlErr"; + echo "Error: " . htmlspecialchars($curlErr) . "
"; + } + if (!empty($response)) { + echo "Response: " . htmlspecialchars($response) . "
"; } echo "

"; exit;