'C'

alembic/versions/9db9ce94286f_add_commercial_field.py

@@ -0,0 +1,65 @@
+"""add_commercial_field
+
+Revision ID: 9db9ce94286f
+Revises: 
+Create Date: 2025-01-29 13:45:40.493950
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = '9db9ce94286f'
+down_revision: Union[str, None] = None
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('invoices',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('invoice_number', sa.String(), nullable=True),
+    sa.Column('date', sa.DateTime(), nullable=True),
+    sa.Column('project', sa.String(), nullable=True),
+    sa.Column('client_name', sa.String(), nullable=True),
+    sa.Column('client_phone', sa.String(), nullable=True),
+    sa.Column('address', sa.String(), nullable=True),
+    sa.Column('total_ht', sa.Float(), nullable=True),
+    sa.Column('tax', sa.Float(), nullable=True),
+    sa.Column('total_ttc', sa.Float(), nullable=True),
+    sa.Column('frame_number', sa.String(), nullable=True),
+    sa.Column('customer_name', sa.String(), nullable=True),
+    sa.Column('amount', sa.Float(), nullable=True),
+    sa.Column('status', sa.String(), nullable=True),
+    sa.Column('created_at', sa.DateTime(), nullable=True),
+    sa.Column('commercial', sa.String(), nullable=True),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_index(op.f('ix_invoices_id'), 'invoices', ['id'], unique=False)
+    op.create_table('invoice_items',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('invoice_id', sa.Integer(), nullable=True),
+    sa.Column('description', sa.String(), nullable=True),
+    sa.Column('unit', sa.String(), nullable=True),
+    sa.Column('quantity', sa.Integer(), nullable=True),
+    sa.Column('length', sa.Float(), nullable=True),
+    sa.Column('unit_price', sa.Float(), nullable=True),
+    sa.Column('total_price', sa.Float(), nullable=True),
+    sa.ForeignKeyConstraint(['invoice_id'], ['invoices.id'], ),
+    sa.PrimaryKeyConstraint('id')
+    )
+    op.create_index(op.f('ix_invoice_items_id'), 'invoice_items', ['id'], unique=False)
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_index(op.f('ix_invoice_items_id'), table_name='invoice_items')
+    op.drop_table('invoice_items')
+    op.drop_index(op.f('ix_invoices_id'), table_name='invoices')
+    op.drop_table('invoices')
+    # ### end Alembic commands ### 

app/db/models.py

@@ -24,6 +24,7 @@ class Invoice(Base):
     amount = Column(Float)
     status = Column(String, default="pending")
     created_at = Column(DateTime, default=datetime.utcnow)
+    commercial = Column(String)
 
     items = relationship("InvoiceItem", back_populates="invoice")
 

app/main.py

@@ -13,6 +13,7 @@ load_dotenv()
 # Get the absolute path to the app directory
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
+
 app = FastAPI(
     title="Invoice Generator",
     description="API for generating invoices",

app/routes/invoices.py

@@ -47,7 +47,8 @@ async def create_new_invoice(
             total_ht=invoice.total_ht,
             tax=invoice.tax,
             total_ttc=invoice.total_ttc,
-            frame_number=invoice.frame_number
+            frame_number=invoice.frame_number,
+            commercial=invoice.commercial
         )
         
         db.add(db_invoice)

app/schemas/invoice.py

@@ -25,6 +25,7 @@ class InvoiceCreate(BaseModel):
     total_ttc: float
     frame_number: Optional[str] = None
     items: List[InvoiceItemCreate]
+    commercial: Optional[str] = "divers"
     
     @computed_field
     def customer_name(self) -> str:

app/services/invoice_service.py

@@ -153,6 +153,10 @@ class InvoiceService:
                 
                 current_y -= LINE_HEIGHT
 
+            def format_currency(value):
+                # Format with 2 decimal places and thousands separator
+                return "{:,.2f}".format(value).replace(",", " ")
+
             def draw_item_row(item, indent=False):
                 nonlocal current_y
                 pdf.setFillColorRGB(*BLACK)
@@ -165,8 +169,8 @@ class InvoiceService:
                     (item.unit, 50),
                     (str(item.quantity), 50),
                     (f"{item.length:.2f}", 60),
-                    (f"{item.unit_price:.2f}", 60),
-                    (f"{item.total_price:.2f}", 170)
+                    (f"{format_currency(item.unit_price)} DH", 60),
+                    (f"{format_currency(item.total_price)} DH", 170)
                 ]
 
                 for value, width in cells:
@@ -192,13 +196,36 @@ class InvoiceService:
                 for item in items:
                     draw_item_row(item, indent=(keyword != "lfflflflf"))
 
-            # NB box with just "NB:" text
+            # NB box with text
             nb_box_width = 200
             nb_box_height = 80
             pdf.setFillColorRGB(*BLACK)
             pdf.rect(20, current_y - nb_box_height, nb_box_width, nb_box_height, stroke=1)
             pdf.setFont("Helvetica-Bold", 12)  # Made slightly larger for better visibility
-            pdf.drawString(60, current_y - nb_box_height + 60, "NB:")
+            pdf.drawString(30, current_y - nb_box_height + 60, "NB:")
+            
+            # Add the new text
+            pdf.setFont("Helvetica", 8)  # Smaller font for the note
+            nb_text = "Toute modification apportée aux plans BA initialement fournis, entraine automatiquement la modification de ce devis."
+            # Split text to fit in box
+            words = nb_text.split()
+            lines = []
+            current_line = []
+            
+            for word in words:
+                current_line.append(word)
+                # Check if current line width exceeds box width
+                if pdf.stringWidth(' '.join(current_line), "Helvetica", 8) > nb_box_width - 20:
+                    current_line.pop()  # Remove last word
+                    lines.append(' '.join(current_line))
+                    current_line = [word]
+            
+            if current_line:
+                lines.append(' '.join(current_line))
+            
+            # Draw each line
+            for i, line in enumerate(lines):
+                pdf.drawString(30, current_y - nb_box_height + 45 - (i * 10), line)
 
             # Totals section
             current_y -= 20
@@ -206,12 +233,12 @@ class InvoiceService:
             row_height = 20
 
             for i, (label1, label2, value) in enumerate([
-                ("Total", "H.T", f"{data.total_ht:.2f} DH"),
-                ("TVA", "20 %", f"{data.tax:.2f} DH"),
-                ("Total", "TTC", f"{data.total_ttc:.2f} DH")
+                ("Total", "H.T", f"{format_currency(data.total_ht)} DH"),
+                ("TVA", "20 %", f"{format_currency(data.tax)} DH"),
+                ("Total", "TTC", f"{format_currency(data.total_ttc)} DH")
             ]):
                 y = current_y - (i * row_height)
-                totals_x = (page_width - totals_table_width) - 27  # Center totals table
+                totals_x = (page_width - totals_table_width) - 27
                 draw_box(pdf, totals_x, y, totals_table_width / 2, row_height)
                 draw_box(pdf, totals_x + totals_table_width / 2, y, totals_table_width / 2, row_height)
                 pdf.drawString(totals_x + 10, y + 6, f"{label1}    {label2}")
@@ -219,13 +246,19 @@ class InvoiceService:
 
             # Footer
             pdf.setFont("Helvetica", 8)
-            if os.path.exists(logo_path):
-                pdf.drawImage(logo_path, MARGIN, 20, width=30, height=15)
-
             footer_text = "Douar Ait Laarassi Tidili, Cercle El Kelâa, Route de Safi, Km 14-40000 Marrakech"
             pdf.drawCentredString(page_width / 2, 30, footer_text)
-            footer_contact = "Tél: 05 24 01 55 54 Fax : 05 24 01 55 29 E-mail : [email protected]"
-            pdf.drawCentredString(page_width / 2, 20, footer_contact)
+
+            # Add commercial info to footer
+            print(f"Commercial value: {data.commercial}")  # Add this debug line
+            if data.commercial and data.commercial.lower() != 'divers':
+                commercial_text = f"Commercial: {data.commercial.upper()}"
+                pdf.drawString(MARGIN, 20, commercial_text)
+                footer_contact = "Tél: 05 24 01 55 54 Fax : 05 24 01 55 29 E-mail : [email protected]"
+                pdf.drawCentredString(page_width / 2, 20, footer_contact)
+            else:
+                footer_contact = "Tél: 05 24 01 55 54 Fax : 05 24 01 55 29 E-mail : [email protected]"
+                pdf.drawCentredString(page_width / 2, 20, footer_contact)
 
             pdf.save()
             buffer.seek(0)

app/templates/index.html

@@ -65,6 +65,17 @@
                                     <label class="btn btn-outline-primary" for="DIV">DIV</label>
                                 </div>
                             </div>
+                            <div class="mb-3">
+                                <label class="form-label">Commercial</label>
+                                <select class="form-control" id="commercial" required>
+                                    <option value="">Sélectionner un commercial</option>
+                                    <option value="khaled">Khaled</option>
+                                    <option value="salah">Salah</option>
+                                    <option value="ismail">Ismail</option>
+                                    <option value="jamal">Jamal</option>
+                                    <option value="divers">Divers</option>
+                                </select>
+                            </div>
                         </div>
                     </div>
                 </div>
@@ -473,7 +484,8 @@
                     items: getAllItems(),
                     frame_number: "",
                     status: "pending",
-                    created_at: new Date().toISOString()
+                    created_at: new Date().toISOString(),
+                    commercial: document.querySelector("#commercial").value || "divers"
                 };
 
                 console.log("Sending invoice data:", data);
@@ -501,7 +513,7 @@
                         headers: { 
                             "Content-Type": "application/json"
                         },
-                        body: JSON.stringify(invoice)  // Send the created invoice data for PDF generation
+                        body: JSON.stringify(invoice)
                     });
 
                     if (!pdfResponse.ok) {