From 909b12ff6c81506626483a2bd76f7992689e2af2 Mon Sep 17 00:00:00 2001
From: Dan Dembinski <ICYN30blah>
Date: Thu, 8 Apr 2021 10:58:01 -0400
Subject: [PATCH] Added bat file to source correct venv and run script.
 Reorganized db connection stuff and added check to create db/tables if they
 don't exist. Uncommented email section and set mark_sent method to only be
 called if not testing.

---
 CFFInvoice.bat     |  2 ++
 InvoiceDatabase.py | 11 ++++++-----
 sendEmail.py       | 14 +++++++-------
 3 files changed, 15 insertions(+), 12 deletions(-)
 create mode 100644 CFFInvoice.bat

diff --git a/CFFInvoice.bat b/CFFInvoice.bat
new file mode 100644
index 0000000..05f7712
--- /dev/null
+++ b/CFFInvoice.bat
@@ -0,0 +1,2 @@
+@echo off
+cmd /k "cd /d C:\Program Files (x86)\AKSESS\Storefront\CFFInvoice\Scripts & activate & cd /d  C:\Program Files (x86)\AKSESS\Storefront\CFFInvoice & python main.py"
\ No newline at end of file
diff --git a/InvoiceDatabase.py b/InvoiceDatabase.py
index d0e8d3b..603e66f 100644
--- a/InvoiceDatabase.py
+++ b/InvoiceDatabase.py
@@ -3,9 +3,6 @@ from sqlalchemy import create_engine, Column, Integer, String, REAL, Boolean
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm import sessionmaker
 
-
-engine = create_engine('sqlite:///cffInvoice.db')
-engine.connect()
 Base = declarative_base()
 
 
@@ -33,7 +30,7 @@ class Invoice(Base):
     ShippingState = Column(String)
     ShippingPostalCode = Column(String)
     InvoiceID = Column(Integer, primary_key=True, autoincrement=True)
-    InvoiceSent = Column(Boolean)
+    InvoiceSent = Column(Boolean, default=0)
 
 
 class ItemDetail(Base):
@@ -53,7 +50,11 @@ class SentInvoices(Base):
     InvoiceID = Column(Integer)
     SentDate = Column(String)
 
-
+engine = create_engine('sqlite:///cffInvoice.db')
+engine.connect()
+Invoice.__table__.create(bind=engine, checkfirst=True)
+ItemDetail.__table__.create(bind=engine, checkfirst=True)
+SentInvoices.__table__.create(bind=engine, checkfirst=True)
 Session = sessionmaker(bind=engine)
 session = Session()
 
diff --git a/sendEmail.py b/sendEmail.py
index b6b2d5c..ea7e0be 100644
--- a/sendEmail.py
+++ b/sendEmail.py
@@ -191,13 +191,13 @@ def send_email(test, record):
 
         msg.add_header('Content-Type', 'text/html')
         msg.attach(bodyHTML)
-        # try:
-        #     with smtplib.SMTP(smtp_server, port, timeout=120) as server:
-        #         # server.sendmail(msg['From'], msg['To'] + ',' + msg['Cc'] + ',' + msg['Bcc'], msg.as_string())
-        #         server.send_message(msg)
-        # except Exception as e:
-        #     print(e)
-        if test is True:
+        try:
+            with smtplib.SMTP(smtp_server, port, timeout=120) as server:
+                # server.sendmail(msg['From'], msg['To'] + ',' + msg['Cc'] + ',' + msg['Bcc'], msg.as_string())
+                server.send_message(msg)
+        except Exception as e:
+            print(e)
+        if test is False:
             InvoiceDatabase.mark_sent(InvoiceID, InvoiceDate)
         sent_orders.append(OrderNumber)
     print(sent_orders)