Update app.py

app.py

@@ -46,10 +46,33 @@ def create_pdf(data, filename):
 
     # Tabel Produk
     elements.append(Paragraph("Daftar Produk yang Ditawarkan:", bold_style))
-    table_data = [["Nama Produk", "Jumlah", "Harga (Rp)"]]
+    
+    # Data tabel
+    table_data = [["Nama Produk", "Jumlah", "Harga (Rp)", "Total (Rp)"]]
+    sub_total = 0
     for p in data['produk']:
-        table_data.append([p['nama'], str(p['jumlah']), f"{p['harga']:,}"])
-    table = Table(table_data)
+        total = p['jumlah'] * p['harga']
+        sub_total += total
+        table_data.append([p['nama'], str(p['jumlah']), f"{p['harga']:,}", f"{total:,}"])
+    
+    # Hitung diskon dan grand total
+    if 'diskon' in data and data['diskon']:
+        diskon_percent = float(data['diskon'])
+        diskon_amount = (diskon_percent / 100) * sub_total
+        grand_total = sub_total - diskon_amount
+    else:
+        diskon_percent = 0
+        diskon_amount = 0
+        grand_total = sub_total
+    
+    # Tambahkan baris sub-total, diskon, dan grand total
+    table_data.append(["", "", "Sub-Total", f"{sub_total:,}"])
+    if diskon_percent > 0:
+        table_data.append(["", "", f"Diskon ({diskon_percent}%)", f"-{diskon_amount:,}"])
+    table_data.append(["", "", "Grand Total", f"{grand_total:,}"])
+    
+    # Buat tabel
+    table = Table(table_data, colWidths=[6*cm, 2*cm, 3*cm, 3*cm])
     table.setStyle(TableStyle([
         ('BACKGROUND', (0, 0), (-1, 0), colors.grey),
         ('TEXTCOLOR', (0, 0), (-1, 0), colors.whitesmoke),
@@ -57,17 +80,19 @@ def create_pdf(data, filename):
         ('FONTNAME', (0, 0), (-1, 0), 'Helvetica-Bold'),
         ('FONTSIZE', (0, 0), (-1, -1), 12),
         ('BOTTOMPADDING', (0, 0), (-1, 0), 12),
-        ('BACKGROUND', (0, 1), (-1, -1), colors.beige),
+        ('BACKGROUND', (0, 1), (-1, -3), colors.beige),
         ('GRID', (0, 0), (-1, -1), 1, colors.black),
+        ('SPAN', (0, -2), (1, -2)),  # Span sub-total
+        ('SPAN', (0, -1), (1, -1)),  # Span grand total
+        ('ALIGN', (2, -2), (3, -1), 'RIGHT'),  # Align right for totals
     ]))
+    if diskon_percent > 0:
+        table.setStyle(TableStyle([
+            ('SPAN', (0, -3), (1, -3)),  # Span diskon
+        ]))
     elements.append(table)
     elements.append(Spacer(1, 0.5*cm))
 
-    # Diskon
-    diskon_text = f"Diskon: {data['diskon']}%".format() if 'diskon' in data else "Diskon: Tidak ada"
-    elements.append(Paragraph(diskon_text, normal_style))
-    elements.append(Spacer(1, 0.5*cm))
-
     # Syarat dan Ketentuan
     syarat_text = f"Syarat dan Ketentuan:<br/>{data['syarat']}" if 'syarat' in data else "Syarat dan Ketentuan: Tidak ada"
     elements.append(Paragraph(syarat_text, normal_style))
@@ -107,7 +132,10 @@ def buat_penawaran(nama_prospek, alamat_prospek, jenis_prospek, produk_dipilih,
         data['produk'].append({'nama': "Produk Contoh", 'jumlah': 1, 'harga': 100000})
 
     if diskon:
-        data['diskon'] = diskon
+        try:
+            data['diskon'] = float(diskon)
+        except ValueError:
+            data['diskon'] = 0
     if syarat:
         data['syarat'] = syarat