grocery_transactions.py

@@ -14,9 +14,10 @@ from app.data.QueryManager import QueryManager, display_mapper
 from app.palette import iter_palettes, solarized
 
 try:
-    from db_credentials import HOST, PASSWORD
+    from db_credentials import USER, HOST, PASSWORD
     host = f'host={HOST}'
     password = f'password={PASSWORD}'
+    user = f'user={USER}'
 except:
     host = ''
     password = ''
@@ -25,8 +26,7 @@ try:
     import os
 
     import psycopg
-    user = os.getenv('USER')
-    conn: Cursor = psycopg.connect(f"{host} dbname=grocery user={user} {password}")
+    conn: Cursor = psycopg.connect(f"{host} dbname=grocery {user} {password}")
     cur = conn.cursor()
 except:
     print('Failed to set up db connection. Entering Mock mode')

grocery_transactions.sh

@@ -66,7 +66,7 @@ else
     PASSWORD=
 fi
 
-psql ${HOST} -d grocery <<EOF
+psql ${HOST} -d grocery -U ${USER} <<EOF
 BEGIN;
 $(cat - )
 SELECT

reconcile.py

@@ -56,6 +56,7 @@ STORE_CODES = {
     'Dreamview Cre': 'DV',
     'new world': 'NW',
     'BIN INN': 'BI',
+    'MAPBI': 'BI',
     'NEW SAVE': 'NS',
     'ORGANIC NATION' : 'ON',
     'The Warehouse' : 'WH',
@@ -70,6 +71,8 @@ STORE_CODES = {
     'FC12-3189-0013895-00': 'DV',
     'ORGANIC FOOD SH' : 'TOFS',
     'WWNZ' : 'CD',
+    'Farmers Market': 'FM',
+    'MAPMISC': 'MISC',
 }
 
 conn = psycopg.connect(f"{host} dbname=grocery {user} {password}")