H

app/services/certificate_service.py

@@ -124,8 +124,10 @@ def build_certificate_pdf(
     c = canvas.Canvas(buf, pagesize=landscape(A4))
 
     # ── Color palette ──
-    NAVY    = HexColor("#0F1B2D")
-    GOLD    = HexColor("#C9A84C")
+    NAVY_HEX = "#0F1B2D"
+    GOLD_HEX = "#C9A84C"
+    NAVY    = HexColor(NAVY_HEX)
+    GOLD    = HexColor(GOLD_HEX)
     WHITE   = HexColor("#FFFFFF")
     LIGHT   = HexColor("#F5F7FA")
     DARK    = HexColor("#1A2332")
@@ -150,9 +152,18 @@ def build_certificate_pdf(
     c.rect(bar_w - 1.5 * mm, 0, 1.5 * mm, height, fill=1, stroke=0)
 
     # ── Alpha Logo on dark bar ──
-    logo_path = os.path.join(os.path.dirname(__file__),
-                             "..", "..", "public", "ALPHA-LOGO.png")
-    if os.path.exists(logo_path):
+    base = os.path.dirname(__file__)
+    logo_candidates = [
+        os.path.join(base, "..", "..", "public", "ALPHA-LOGO.png"),       # CyberArena/../public/
+        os.path.join(base, "..", "..", "..", "public", "ALPHA-LOGO.png"), # Apex/public/
+        os.path.join(base, "..", "..", "ALPHA-LOGO.png"),                 # project root
+    ]
+    logo_path = None
+    for p in logo_candidates:
+        if os.path.exists(p):
+            logo_path = p
+            break
+    if logo_path:
         logo_size = 22 * mm
         c.drawImage(
             logo_path,
@@ -164,7 +175,6 @@ def build_certificate_pdf(
             mask="auto",
         )
     else:
-        # Fallback text logo
         c.setFillColor(GOLD)
         c.setFont("Helvetica-Bold", 14)
         c.drawCentredString(bar_w / 2, height - 38 * mm, "ALPHA")
@@ -302,7 +312,7 @@ def build_certificate_pdf(
     qr = qrcode.QRCode(box_size=4, border=0)
     qr.add_data(qr_payload)
     qr.make(fit=True)
-    qr_img = qr.make_image(fill_color=str(NAVY), back_color="white", image_factory=PilImage)
+    qr_img = qr.make_image(fill_color=NAVY_HEX, back_color="white", image_factory=PilImage)
     qr_path = os.path.join(tempfile.gettempdir(), f"ca_qr_{verify_code.replace(' ', '_')}.png")
     qr_img.save(qr_path, format="PNG")
     qr_size = 24 * mm
@@ -336,12 +346,11 @@ def build_certificate_pdf(
     s_font = 6
     c.setFont("Helvetica-Bold", s_font)
     for angle, text in [(0, "AUTHENTIC"), (90, "CERTIFIED")]:
-        saver = c
         c.saveState()
         c.translate(seal_x, seal_y)
         c.rotate(angle)
         c.drawCentredString(0, seal_r * 0.65, text)
-        c.restore()
+        c.restoreState()
     c.setFont("Helvetica-Bold", 5)
     c.drawCentredString(seal_x, seal_y - 2 * mm, "✓")