🚨 format python code using black

This commit is contained in:
Nikolai R Kristiansen committed 2021-10-27 19:22:25 +02:00
1 parent 9c4a5b3d84
commit a052397990
24 files changed
+643 -407

No files matched your search

+43 -36
View File
@@ -1,4 +1,3 @@
from datetime import datetime
from django.conf import settings
@@ -6,7 +5,6 @@ from django.db import models
from django.utils.translation import ugettext_lazy as _
class Product(models.Model):
name = models.CharField(max_length=64)
sale_price_int = models.FloatField()
@@ -14,7 +12,7 @@ class Product(models.Model):
description = models.CharField(max_length=256, blank=True)
volume_liter = models.FloatField(null=True)
alcohol_percent = models.FloatField(null=True)
image = models.ImageField(upload_to='products', blank=True)
image = models.ImageField(upload_to="products", blank=True)
customer_support = models.CharField(max_length=32, blank=True)
inventory_amount = models.FloatField(default=0)
active = models.BooleanField(default=True)
@@ -24,20 +22,20 @@ class Product(models.Model):
@property
def wholesale_unit_price(self):
"""
This is not accurate.
This is not accurate.
"""
if self.inventory_amount <= 0:
return 0
unit_prices = self.transactions.order_by('created').values('amount', 'unit_price')
unit_prices = self.transactions.order_by("created").values("amount", "unit_price")
sum_units = 0
for up in unit_prices:
sum_units += up['amount']
sum_units += up["amount"]
if self.inventory_amount <= sum_units:
return up['unit_price']
return up["unit_price"]
if len(unit_prices) > 0:
return unit_prices[0]['unit_price']
return unit_prices[0]["unit_price"]
return 0
@@ -49,13 +47,18 @@ class Product(models.Model):
return self.name
class Meta:
ordering = ['name']
ordering = ["name"]
class Order(models.Model):
customer = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE, null=True, blank=True, related_name='orders')
order_sum = models.FloatField(db_column='sum')
customer = models.ForeignKey(
settings.AUTH_USER_MODEL,
on_delete=models.CASCADE,
null=True,
blank=True,
related_name="orders",
)
order_sum = models.FloatField(db_column="sum")
created = models.DateTimeField(auto_now_add=True)
def is_external(self):
@@ -68,12 +71,11 @@ class Order(models.Model):
return "{}: {} kr".format(self.customer or "Ekstern", self.order_sum)
class OrderLine(models.Model):
order = models.ForeignKey('main.Order', on_delete=models.CASCADE, related_name='orderlines')
product = models.ForeignKey('main.Product', on_delete=models.CASCADE, related_name='orderlines')
order = models.ForeignKey("main.Order", on_delete=models.CASCADE, related_name="orderlines")
product = models.ForeignKey("main.Product", on_delete=models.CASCADE, related_name="orderlines")
amount = models.IntegerField()
unit_price = models.FloatField(verbose_name=_('Enhetspris'))
unit_price = models.FloatField(verbose_name=_("Enhetspris"))
@property
def price(self):
@@ -83,13 +85,13 @@ class OrderLine(models.Model):
return "{} {} ({} kr per)".format(self.amount, self.product, self.unit_price)
class Meta:
unique_together = ('order', 'product')
unique_together = ("order", "product")
class Transaction(models.Model):
""" Money """
user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE, related_name='transactions')
"""Money"""
user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE, related_name="transactions")
amount = models.FloatField()
created = models.DateTimeField(auto_now_add=True)
@@ -97,14 +99,23 @@ class Transaction(models.Model):
return "{}: {}: {}".format(self.id, self.user, self.amount)
class InventoryTransaction(models.Model):
""" Goods """
user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE, related_name='inventory_transactions')
product = models.ForeignKey('main.Product', on_delete=models.CASCADE, related_name='transactions', verbose_name=_('Produkt'))
amount = models.FloatField(verbose_name=_('Antall'))
unit_price = models.FloatField(verbose_name=_('Enhetspris'))
comment = models.TextField(verbose_name=_('Kommentar'), blank=True)
"""Goods"""
user = models.ForeignKey(
settings.AUTH_USER_MODEL,
on_delete=models.CASCADE,
related_name="inventory_transactions",
)
product = models.ForeignKey(
"main.Product",
on_delete=models.CASCADE,
related_name="transactions",
verbose_name=_("Produkt"),
)
amount = models.FloatField(verbose_name=_("Antall"))
unit_price = models.FloatField(verbose_name=_("Enhetspris"))
comment = models.TextField(verbose_name=_("Kommentar"), blank=True)
created = models.DateTimeField(auto_now_add=True)
@property
@@ -113,16 +124,12 @@ class InventoryTransaction(models.Model):
def __str__(self):
return "{}: {}: {}. {:.0f} stykker ({} kr per)".format(
self.id,
self.user,
self.product,
self.amount,
self.unit_price)
self.id, self.user, self.product, self.amount, self.unit_price
)
class UserProfile(models.Model):
user = models.OneToOneField(settings.AUTH_USER_MODEL, on_delete=models.CASCADE, related_name='profile')
user = models.OneToOneField(settings.AUTH_USER_MODEL, on_delete=models.CASCADE, related_name="profile")
balance = models.FloatField(default=0.0)
image = models.URLField(blank=True)
@@ -130,7 +137,7 @@ class UserProfile(models.Model):
if len(self.user.orders.all()) == 0:
return None
return self.user.orders.order_by('-created')[0]
return self.user.orders.order_by("-created")[0]
def last_purchase_date(self):
last = self.last_purchase()
@@ -141,7 +148,7 @@ class UserProfile(models.Model):
from django.templatetags.static import static
if not self.image:
return static('dist/images/unknown_person.png')
return static("dist/images/unknown_person.png")
return self.image