photowall/api2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Add price calculations in inches, new minimum size 30x30cm (#74)" (#75)

Browse Source 
This reverts commit 5ca2ae727c.
This commit is contained in:
Fredrik Ringqvist
2024-05-24 14:35:43 +02:00
committed by GitHub
parent 5ca2ae727c
commit 5f9f6c90ed
2 changed files with 12 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/resources/prices.py
+9 -21
View File
@@ -45,24 +45,23 @@ def get_designer():
@validate_number("width", "height")
@validate_exists("market")
def wallpaper():
width = request.args.get("width", type=float)
height = request.args.get("height", type=float)
width = request.args.get("width", type=int)
height = request.args.get("height", type=int)
market_id = request.args.get("market", type=int)
product_id = request.args.get("product", type=int)
unit = request.args.get("unit", type=str)
new_version = request.args.get("new_version") is not None
market = Market.query.get_or_404(market_id)
designer = get_designer()
reseller = get_reseller()
if width is None or height is None:
raise ValidationError("width and height must be float")
raise ValidationError("width and height must be integers")
materials = Material.query.wallpapers().all()
data = []
for material in materials:
if new_version:
prices = wallpaper_price_new(product_id, width, height, material, market, unit)
prices = wallpaper_price_new(product_id, width, height, material, market)
data.append(
{
"material": material.name,
@@ -147,18 +146,8 @@ def get_inquiry_measurements(inquiry):
# first try to get it from the query string. If that fails try to get it
# from the inquiry row in the database
unit = request.args.get("unit", type=str, default=None)
width = request.args.get("width", type=float, default=None)
height = request.args.get("height", type=float, default=None)
if unit and not (width and height):
raise Exception("With unit in query string width and height must also be there.")
if not width:
width = inquiry.width
if not height:
height = inquiry.height
width = request.args.get("width", type=int, default=inquiry.width)
height = request.args.get("height", type=int, default=inquiry.height)
# if we still are missing a width/height just set them to 1 to avoid
# errors in the price calculations
@@ -168,25 +157,24 @@ def get_inquiry_measurements(inquiry):
if not height:
height = 1
return width, height, unit
return width, height
def inquiry_wallpaper(inquiry, new_version=False):
width, height, unit = get_inquiry_measurements(inquiry)
width, height = get_inquiry_measurements(inquiry)
data = {
"id": inquiry.id,
"group": "wallpaper",
"width": width,
"height": height,
"unit": unit,
"retouch_price": inquiry.local_price_retouch(rounded=False, inc_vat=True),
}
materials = Material.query.wallpapers().all()
prices = []
for material in materials:
if new_version:
price = inquiry_price_new(inquiry, material=material, width=width, height=height, unit=unit)
price = inquiry_price_new(inquiry, material=material, width=width, height=height)
prices.append(
{
"material": material.name,