crudo/macao-pos
2
0
Fork 2
Code Issues 4 Pull Requests 1 Releases Activity

Database schema change. Removed 'currency' column from 'Product'.

Browse Source
This commit is contained in:
crudo 2017-03-22 17:56:54 +01:00
parent 27983883d7
commit 1dddddb97d
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cli.py
View File

@ -99,19 +99,17 @@ def product():
def tabulate_products(products): def tabulate_products(products):
tab = [["UID", "Name", "Price", "Currency", "Enabled", "Created at"]] tab = [["UID", "Name", "Price", "Enabled", "Created at"]]
for p in products: for p in products:
tab.append([p.uid, p.name, p.price, p.currency, tab.append([p.uid, p.name, p.price, p.is_active, p.created_at])
p.is_active, p.created_at])
return tabulate(tab, headers='firstrow') return tabulate(tab, headers='firstrow')
@product.command('add') @product.command('add')
@click.argument('name') @click.argument('name')
@click.argument('price') @click.argument('price')
@click.option('--currency') def product_add(name, price):
def product_add(name, price, currency): product = Product(name=name, price=price)
product = Product(name=name, currency=currency, price=price)
with db.get_session() as session: with db.get_session() as session:
session.add(product) session.add(product)
print("Product succesfully added.") print("Product succesfully added.")

3
pos/database.py
View File

@ -10,7 +10,6 @@ from sqlalchemy.orm import relationship
from sqlalchemy_utils import force_auto_coercion from sqlalchemy_utils import force_auto_coercion
from sqlalchemy_utils.types.password import PasswordType from sqlalchemy_utils.types.password import PasswordType
from sqlalchemy_utils.types.currency import CurrencyType
from pos.logging import get_logger from pos.logging import get_logger
@ -23,7 +22,6 @@ ENGINE_SQLITE = "sqlite:///{path}"
ENGINE_SQLITE_MEMORY = "sqlite://" ENGINE_SQLITE_MEMORY = "sqlite://"
PASSWORD_SCHEMES = ['pbkdf2_sha512'] PASSWORD_SCHEMES = ['pbkdf2_sha512']
DEFAULT_CURRENCY = 'EUR'
Base = sqlalchemy.ext.declarative.declarative_base() Base = sqlalchemy.ext.declarative.declarative_base()
@ -119,7 +117,6 @@ class Product(Base):
__tablename__ = 'products' __tablename__ = 'products'
uid = Column(Integer, primary_key=True) uid = Column(Integer, primary_key=True)
name = Column(String, nullable=False) name = Column(String, nullable=False)
currency = Column(CurrencyType, nullable=False, default=DEFAULT_CURRENCY)
price = Column(Integer, nullable=False) price = Column(Integer, nullable=False)
created_at = Column(DateTime, nullable=False, default=datetime.now) created_at = Column(DateTime, nullable=False, default=datetime.now)
is_active = Column(Boolean, nullable=False, server_default='1') is_active = Column(Boolean, nullable=False, server_default='1')