feat: use true column names for transaction data models
as much as i kind of want to "rename" some of these for convenience, it seems safest here to just stick with true names to avoid confusion
This commit is contained in:
		
							parent
							
								
									a2a1d7faee
								
							
						
					
					
						commit
						97a1396a54
					
				
					 1 changed files with 25 additions and 34 deletions
				
			
		| 
						 | 
				
			
			@ -36,25 +36,21 @@ class TransactionDetailBase:
 | 
			
		|||
    """
 | 
			
		||||
 | 
			
		||||
    # register
 | 
			
		||||
    register_number = sa.Column('register_no', sa.Integer(), nullable=True)
 | 
			
		||||
    register_no = sa.Column(sa.Integer(), nullable=True)
 | 
			
		||||
 | 
			
		||||
    # txn
 | 
			
		||||
    transaction_id = sa.Column('trans_id', sa.Integer(), nullable=True)
 | 
			
		||||
    transaction_number = sa.Column('trans_no', sa.Integer(), nullable=True)
 | 
			
		||||
    transaction_type = sa.Column('trans_type', sa.String(length=1), nullable=True)
 | 
			
		||||
    transaction_subtype = sa.Column('trans_subtype', sa.String(length=2), nullable=True)
 | 
			
		||||
    trans_id = sa.Column(sa.Integer(), nullable=True)
 | 
			
		||||
    trans_no = sa.Column(sa.Integer(), nullable=True)
 | 
			
		||||
    trans_type = sa.Column(sa.String(length=1), nullable=True)
 | 
			
		||||
    trans_subtype = sa.Column(sa.String(length=2), nullable=True)
 | 
			
		||||
    trans_status = sa.Column(sa.String(length=1), nullable=True)
 | 
			
		||||
 | 
			
		||||
    @declared_attr
 | 
			
		||||
    def transaction_status(self):
 | 
			
		||||
        return orm.synonym('trans_status')
 | 
			
		||||
 | 
			
		||||
    # cashier
 | 
			
		||||
    employee_number = sa.Column('emp_no', sa.Integer(), nullable=True)
 | 
			
		||||
    emp_no = sa.Column(sa.Integer(), nullable=True)
 | 
			
		||||
 | 
			
		||||
    # customer
 | 
			
		||||
    card_number = sa.Column('card_no', sa.Integer(), nullable=True)
 | 
			
		||||
    member_type = sa.Column('memType', sa.Integer(), nullable=True)
 | 
			
		||||
    card_no = sa.Column(sa.Integer(), nullable=True)
 | 
			
		||||
    memType = sa.Column(sa.Integer(), nullable=True)
 | 
			
		||||
    staff = sa.Column(sa.Boolean(), nullable=True)
 | 
			
		||||
 | 
			
		||||
    ##############################
 | 
			
		||||
| 
						 | 
				
			
			@ -63,7 +59,7 @@ class TransactionDetailBase:
 | 
			
		|||
 | 
			
		||||
    upc = sa.Column(sa.String(length=13), nullable=True)
 | 
			
		||||
 | 
			
		||||
    department_number = sa.Column('department', sa.Integer(), nullable=True)
 | 
			
		||||
    department = sa.Column(sa.Integer(), nullable=True)
 | 
			
		||||
 | 
			
		||||
    description = sa.Column(sa.String(length=30), nullable=True)
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -73,51 +69,46 @@ class TransactionDetailBase:
 | 
			
		|||
 | 
			
		||||
    cost = sa.Column(sa.Numeric(precision=10, scale=2), nullable=True)
 | 
			
		||||
 | 
			
		||||
    unitPrice = sa.Column('unitPrice', sa.Numeric(precision=10, scale=2), nullable=True)
 | 
			
		||||
 | 
			
		||||
    @declared_attr
 | 
			
		||||
    def unit_price(self):
 | 
			
		||||
        return orm.synonym('unitPrice')
 | 
			
		||||
    unitPrice = sa.Column(sa.Numeric(precision=10, scale=2), nullable=True)
 | 
			
		||||
 | 
			
		||||
    total = sa.Column(sa.Numeric(precision=10, scale=2), nullable=True)
 | 
			
		||||
 | 
			
		||||
    reg_price = sa.Column('regPrice', sa.Numeric(precision=10, scale=2), nullable=True)
 | 
			
		||||
    regPrice = sa.Column(sa.Numeric(precision=10, scale=2), nullable=True)
 | 
			
		||||
 | 
			
		||||
    tax = sa.Column(sa.SmallInteger(), nullable=True)
 | 
			
		||||
 | 
			
		||||
    @declared_attr
 | 
			
		||||
    def tax_rate_id(self):
 | 
			
		||||
        return orm.synonym('tax')
 | 
			
		||||
 | 
			
		||||
    food_stamp = sa.Column('foodstamp', sa.Boolean(), nullable=True)
 | 
			
		||||
    foodstamp = sa.Column(sa.Boolean(), nullable=True)
 | 
			
		||||
 | 
			
		||||
    discount = sa.Column(sa.Numeric(precision=10, scale=2), nullable=True)
 | 
			
		||||
 | 
			
		||||
    member_discount = sa.Column('memDiscount', sa.Numeric(precision=10, scale=2), nullable=True)
 | 
			
		||||
    memDiscount = sa.Column(sa.Numeric(precision=10, scale=2), nullable=True)
 | 
			
		||||
 | 
			
		||||
    discountable = sa.Column(sa.Boolean(), nullable=True)
 | 
			
		||||
 | 
			
		||||
    discount_type = sa.Column('discounttype', sa.Integer(), nullable=True)
 | 
			
		||||
    discounttype = sa.Column(sa.Integer(), nullable=True)
 | 
			
		||||
 | 
			
		||||
    voided = sa.Column(sa.Integer(), nullable=True)
 | 
			
		||||
 | 
			
		||||
    percent_discount = sa.Column('percentDiscount', sa.Integer(), nullable=True)
 | 
			
		||||
    percentDiscount = sa.Column(sa.Integer(), nullable=True)
 | 
			
		||||
 | 
			
		||||
    item_quantity = sa.Column('ItemQtty', sa.Float(), nullable=True)
 | 
			
		||||
    ItemQtty = sa.Column(sa.Float(), nullable=True)
 | 
			
		||||
 | 
			
		||||
    volume_discount_type = sa.Column('volDiscType', sa.Integer(), nullable=True)
 | 
			
		||||
    volDiscType = sa.Column(sa.Integer(), nullable=True)
 | 
			
		||||
 | 
			
		||||
    volume = sa.Column(sa.Integer(), nullable=True)
 | 
			
		||||
 | 
			
		||||
    volume_special = sa.Column('VolSpecial', sa.Numeric(precision=10, scale=2), nullable=True)
 | 
			
		||||
    VolSpecial = sa.Column(sa.Numeric(precision=10, scale=2), nullable=True)
 | 
			
		||||
 | 
			
		||||
    mix_match = sa.Column('mixMatch', sa.String(length=13), nullable=True)
 | 
			
		||||
    mixMatch = sa.Column(sa.String(length=13), nullable=True)
 | 
			
		||||
 | 
			
		||||
    matched = sa.Column(sa.Boolean(), nullable=True)
 | 
			
		||||
 | 
			
		||||
    num_flag = sa.Column('numflag', sa.Integer(), nullable=True, default=0)
 | 
			
		||||
    numflag = sa.Column(sa.Integer(), nullable=True, default=0)
 | 
			
		||||
 | 
			
		||||
    char_flag = sa.Column('charflag', sa.String(length=2), nullable=True)
 | 
			
		||||
    charflag = sa.Column(sa.String(length=2), nullable=True)
 | 
			
		||||
 | 
			
		||||
    def __str__(self):
 | 
			
		||||
        return self.description or ''
 | 
			
		||||
        txnid = '-'.join([str(val) for val in [self.register_no,
 | 
			
		||||
                                               self.trans_no,
 | 
			
		||||
                                               self.trans_id]])
 | 
			
		||||
        return f"{txnid} {self.description or ''}"
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue