aa-buybackprogram 2.1.0__tar.gz → 2.3.0__tar.gz

{aa_buybackprogram-2.1.0 → aa_buybackprogram-2.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: aa-buybackprogram
-Version: 2.1.0
+Version: 2.3.0
 Summary: Buyback program plugin app for Alliance Auth.
 Author-email: Ikarus Cesaille <contact@eve-linknet.com>
 Requires-Python: >=3.8
@@ -283,9 +283,9 @@ You can use a price density modifier which will add a additional tax on items wi
 
 > :information_source: This setting is aimer more at high sec buyback programs.
 
-##### Compressible price density modifier
+##### Ore volume based on compressed volume
 
-You can select to ignore price density calculations for items that can be compressed. This is helpful when the compressed variants do not have proper buy orders in Jita. If you set this to True then the compressible item density will be calculated based on the isk / volume of the compression variant of the sold item.
+Using this setting will calculate all items that can be compressed (mainly ore and ice) based on the compressed variant volume and use this volume instead of the raw volume to calculate the hauling and price dencity costs. This setting is mainly aimed at null sec where you might get raw ore sold to you but want to compress it before shipping as raw ore volume is very high and will cause high hauling costs.
 
 ##### Price density threshold
 

{aa_buybackprogram-2.1.0 → aa_buybackprogram-2.3.0}/README.md

@@ -258,9 +258,9 @@ You can use a price density modifier which will add a additional tax on items wi
 
 > :information_source: This setting is aimer more at high sec buyback programs.
 
-##### Compressible price density modifier
+##### Ore volume based on compressed volume
 
-You can select to ignore price density calculations for items that can be compressed. This is helpful when the compressed variants do not have proper buy orders in Jita. If you set this to True then the compressible item density will be calculated based on the isk / volume of the compression variant of the sold item.
+Using this setting will calculate all items that can be compressed (mainly ore and ice) based on the compressed variant volume and use this volume instead of the raw volume to calculate the hauling and price dencity costs. This setting is mainly aimed at null sec where you might get raw ore sold to you but want to compress it before shipping as raw ore volume is very high and will cause high hauling costs.
 
 ##### Price density threshold
 

{aa_buybackprogram-2.1.0 → aa_buybackprogram-2.3.0}/buybackprogram/__init__.py

@@ -2,5 +2,5 @@
 
 default_app_config = "buybackprogram.apps.BuybackProgramConfig"
 
-__version__ = "2.1.0"
+__version__ = "2.3.0"
 __title__ = "Buyback Program"

{aa_buybackprogram-2.1.0 → aa_buybackprogram-2.3.0}/buybackprogram/forms.py

@@ -101,7 +101,7 @@ class LocationForm(forms.Form):
         max_length=32,
     )
 
-    structure_id = forms.CharField(
+    structure_id = forms.IntegerField(
         required=False,
         label="Structure/station ID",
         help_text="The ingame ID for the structure you wish to accept the contracts at. <strong>If left empty the program statistics page will not track if the contract is actually made at the correct structure or not.</strong>",

{aa_buybackprogram-2.1.0 → aa_buybackprogram-2.3.0}/buybackprogram/helpers.py

@@ -75,6 +75,10 @@ def get_or_create_prices(item_id):
         return ItemPrices.objects.get(eve_type_id=item_id)
 
     except ItemPrices.DoesNotExist:
+        logger.debug(
+            "Item %s does not have prices stored in database, fetching prices now ..."
+            % item_id
+        )
         if BUYBACKPROGRAM_PRICE_METHOD == "Fuzzwork":
             response_fuzzwork = requests.get(
                 "https://market.fuzzwork.co.uk/aggregates/",
@@ -86,12 +90,14 @@ def get_or_create_prices(item_id):
 
             items_fuzzwork = response_fuzzwork.json()
 
-            buy = int(float(items_fuzzwork[str(item_id)]["buy"]["max"]))
-            sell = int(float(items_fuzzwork[str(item_id)]["sell"]["min"]))
-            buy_average = int(float(items_fuzzwork[str(item_id)]["buy"]["percentile"]))
-            sell_average = int(
-                float(items_fuzzwork[str(item_id)]["sell"]["percentile"])
-            )
+            buy = float(items_fuzzwork[str(item_id)]["buy"]["max"])
+            logger.debug("Buy price set to %s" % buy)
+            sell = float(items_fuzzwork[str(item_id)]["sell"]["min"])
+            logger.debug("Sell price set to %s" % sell)
+            buy_average = float(items_fuzzwork[str(item_id)]["buy"]["percentile"])
+            logger.debug("Buy average price set to %s" % buy_average)
+            sell_average = float(items_fuzzwork[str(item_id)]["sell"]["percentile"])
+            logger.debug("Sell average price set to %s" % sell_average)
 
         elif BUYBACKPROGRAM_PRICE_METHOD == "Janice":
             if valid_janice_api_key():
@@ -106,13 +112,14 @@ def get_or_create_prices(item_id):
 
                 item_janice = response_janice.json()
 
-                buy = int(float(item_janice["immediatePrices"]["buyPrice5DayMedian"]))
-                sell = int(float(item_janice["immediatePrices"]["sellPrice5DayMedian"]))
-                buy_average = int(
-                    float(item_janice["top5AveragePrices"]["buyPrice5DayMedian"])
+                buy = float(item_janice["immediatePrices"]["buyPrice5DayMedian"])
+                sell = float(item_janice["immediatePrices"]["sellPrice5DayMedian"])
+                buy_average = float(
+                    item_janice["top5AveragePrices"]["buyPrice5DayMedian"]
                 )
-                sell_average = int(
-                    float(item_janice["top5AveragePrices"]["sellPrice5DayMedian"])
+
+                sell_average = float(
+                    item_janice["top5AveragePrices"]["sellPrice5DayMedian"]
                 )
             else:
                 logger.error(
@@ -140,10 +147,12 @@ def get_or_create_prices(item_id):
                     sell=sell_average,
                     updated=updated,
                 )
+                logger.debug("Price stored in database %s" % price)
             else:
                 price = ItemPrices.objects.create(
                     eve_type_id=item_id, buy=buy, sell=sell, updated=updated
                 )
+                logger.debug("Price stored in database %s" % price)
 
             return price
         except Error as e:
@@ -367,28 +376,34 @@ def get_item_prices(item_type, name, quantity, program):
 
         # Get compressed versions of the ores that are not yet compressed
         if is_ore(item_type.eve_group.id):
-            if "Compressed" in name:
-                compresed_name = name
-            else:
-                compresed_name = "Compressed " + name
+            try:
+                if "Compressed" in name:
+                    compresed_name = name
+                else:
+                    compresed_name = "Compressed " + name
 
-            compresed_type = EveType.objects.filter(name=compresed_name).first()
+                compresed_type = EveType.objects.filter(name=compresed_name).first()
 
-            compression_price = get_or_create_prices(compresed_type.id)
+                compression_price = get_or_create_prices(compresed_type.id)
 
-            compressed_type_prices = {
-                "id": compression_price.eve_type_id,
-                "quantity": quantity,
-                "buy": compression_price.buy,
-                "sell": compression_price.sell,
-            }
+                compressed_type_prices = {
+                    "id": compression_price.eve_type_id,
+                    "quantity": quantity,
+                    "buy": compression_price.buy,
+                    "sell": compression_price.sell,
+                }
 
-            has_price_variants = True
+                has_price_variants = True
 
-            logger.debug(
-                "Prices: Got compression prices %s ISK for %s based on original item %s"
-                % (compression_price.buy, compresed_name, name)
-            )
+                logger.debug(
+                    "Prices: Got compression prices %s ISK for %s based on original item %s"
+                    % (compression_price.buy, compresed_name, name)
+                )
+            except Exception as e:
+                logger.error(
+                    f"Failed to get compression prices for {compresed_name}: {e}"
+                )
+                compressed_type_prices = False
 
         # If item can't or should not be compressed
         else:
@@ -460,8 +475,8 @@ def get_item_values(item_type, item_prices, program):
     # RAW VARIANT VALUES
     if item_prices["raw_prices"] and item_prices["raw_prices"]["raw_price_used"]:
         quantity = item_prices["raw_prices"]["quantity"]
-        sell = item_prices["raw_prices"]["sell"]
-        buy = item_prices["raw_prices"]["buy"]
+        sell = float(item_prices["raw_prices"]["sell"])
+        buy = float(item_prices["raw_prices"]["buy"])
         split = statistics.median([sell, buy])
 
         # Determine what price type we should use
@@ -555,12 +570,13 @@ def get_item_values(item_type, item_prices, program):
             )
 
             price_dencity = (
-                item_prices["compression_prices"]["buy"] / compressed_version.volume
+                float(item_prices["compression_prices"]["buy"])
+                / compressed_version.volume
             )
 
             price_dencity_tax = get_price_dencity_tax(
                 program,
-                item_prices["compression_prices"]["buy"],
+                float(item_prices["compression_prices"]["buy"]),
                 compressed_version.volume,
                 item_prices["compression_prices"]["quantity"],
                 is_ore(item_type.eve_group.id),
@@ -579,14 +595,14 @@ def get_item_values(item_type, item_prices, program):
 
             if not item_type.volume <= 0:
                 price_dencity = (
-                    item_prices["raw_prices"]["buy"] / item_type.packaged_volume
+                    float(item_prices["raw_prices"]["buy"]) / item_type.packaged_volume
                 )
             else:
                 price_dencity = False
 
             price_dencity_tax = get_price_dencity_tax(
                 program,
-                item_prices["raw_prices"]["buy"],
+                float(item_prices["raw_prices"]["buy"]),
                 item_type.packaged_volume,
                 item_prices["raw_prices"]["quantity"],
                 is_ore(item_type.eve_group.id),
@@ -606,8 +622,8 @@ def get_item_values(item_type, item_prices, program):
             materials = EveType.objects.filter(id=material["id"]).first()
 
             quantity = material["quantity"]
-            sell = material["sell"]
-            buy = material["buy"]
+            sell = float(material["sell"])
+            buy = float(material["buy"])
             split = statistics.median([sell, buy])
 
             # Determine what price type we should use
@@ -684,8 +700,8 @@ def get_item_values(item_type, item_prices, program):
         ).first()
 
         quantity = item_prices["compression_prices"]["quantity"]
-        buy = item_prices["compression_prices"]["buy"]
-        sell = item_prices["compression_prices"]["sell"]
+        buy = float(item_prices["compression_prices"]["buy"])
+        sell = float(item_prices["compression_prices"]["sell"])
         split = statistics.median([sell, buy])
 
         # Determine what price type we should use
@@ -763,8 +779,8 @@ def get_item_values(item_type, item_prices, program):
     # Get value for NPC price
     if item_prices["npc_prices"]:
         quantity = item_prices["npc_prices"]["quantity"]
-        sell = item_prices["npc_prices"]["sell"]
-        buy = item_prices["npc_prices"]["buy"]
+        sell = float(item_prices["npc_prices"]["sell"])
+        buy = float(item_prices["npc_prices"]["buy"])
         split = statistics.median([sell, buy])
 
         # Determine what price type we should use
@@ -868,9 +884,9 @@ def get_item_values(item_type, item_prices, program):
             [raw_item["unit_value"], refined["unit_value"], compressed["unit_value"]]
         )
     else:
-        buy_value = npc_item["value"]
-        raw_value = npc_item["raw_value"]
-        unit_value = npc_item["unit_value"]
+        buy_value = float(npc_item["value"])
+        raw_value = float(npc_item["raw_value"])
+        unit_value = float(npc_item["unit_value"])
 
     # Determine what value we will use for buy value
     if buy_value == raw_item["value"]:
@@ -1013,6 +1029,9 @@ def get_item_buy_value(buyback_data, program, donation):
                 if (
                     item["item_prices"]["compression_prices"]
                     and program.use_compressed_value
+                ) or (
+                    program.compression_price_dencity_modifier
+                    and is_ore(item["type_data"].eve_group.id)
                 ):
                     compressed_version = EveType.objects.filter(
                         id=item["item_prices"]["compression_prices"]["id"]
@@ -1122,7 +1141,7 @@ def get_tracking_number(
         taxes=contract_price_data["total_tax_amount"],
         hauling_cost=contract_price_data["total_hauling_cost"],
         donation=contract_price_data["total_donation_amount"],
-        net_price=round(contract_price_data["contract_net_total"]),
+        net_price=contract_price_data["contract_net_total"],
         tracking_number=tracking_number,
         created_at=timezone.now(),
         additional_notes=additional_notes,

{aa_buybackprogram-2.1.0 → aa_buybackprogram-2.3.0}/buybackprogram/management/commands/buybackprogram_load_prices.py

@@ -84,15 +84,15 @@ class Command(BaseCommand):
                 if not BUYBACKPROGRAM_PRICE_INSTANT_PRICES:
                     item = ItemPrices(
                         eve_type_id=key,
-                        buy=int(float(value["buy"]["percentile"])),
-                        sell=int(float(value["sell"]["percentile"])),
+                        buy=float(value["buy"]["percentile"]),
+                        sell=float(value["sell"]["percentile"]),
                         updated=timezone.now(),
                     )
                 else:
                     item = ItemPrices(
                         eve_type_id=key,
-                        buy=int(float(value["buy"]["max"])),
-                        sell=int(float(value["sell"]["min"])),
+                        buy=float(value["buy"]["max"]),
+                        sell=float(value["sell"]["min"]),
                         updated=timezone.now(),
                     )
 

aa_buybackprogram-2.3.0/buybackprogram/migrations/0016_alter_program_compression_price_dencity_modifier.py

@@ -0,0 +1,21 @@
+# Generated by Django 4.2.11 on 2024-10-02 03:59
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("buybackprogram", "0015_faq_contractnotification_header_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="program",
+            name="compression_price_dencity_modifier",
+            field=models.BooleanField(
+                default=False,
+                help_text="Should we use compressed volume for items that can be compressed such as ore and ice in fuel cost and price dencity calculations. If set to False the raw volume is used for volume calculations if the item does not have a compressed price variant available from the use compressed value setting.",
+                verbose_name="Ore volume based on compressed volume",
+            ),
+        ),
+    ]

aa_buybackprogram-2.3.0/buybackprogram/migrations/0017_alter_contract_price_alter_contract_volume_and_more.py

@@ -0,0 +1,64 @@
+# Generated by Django 4.2.11 on 2024-11-03 04:42
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("buybackprogram", "0016_alter_program_compression_price_dencity_modifier"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="contract",
+            name="price",
+            field=models.DecimalField(decimal_places=2, max_digits=20),
+        ),
+        migrations.AlterField(
+            model_name="contract",
+            name="volume",
+            field=models.DecimalField(decimal_places=2, max_digits=20),
+        ),
+        migrations.AlterField(
+            model_name="itemprices",
+            name="buy",
+            field=models.DecimalField(decimal_places=2, max_digits=20),
+        ),
+        migrations.AlterField(
+            model_name="itemprices",
+            name="sell",
+            field=models.DecimalField(decimal_places=2, max_digits=20),
+        ),
+        migrations.AlterField(
+            model_name="tracking",
+            name="donation",
+            field=models.DecimalField(
+                blank=True, decimal_places=2, max_digits=20, null=True
+            ),
+        ),
+        migrations.AlterField(
+            model_name="tracking",
+            name="hauling_cost",
+            field=models.DecimalField(decimal_places=2, max_digits=20),
+        ),
+        migrations.AlterField(
+            model_name="tracking",
+            name="net_price",
+            field=models.DecimalField(decimal_places=2, max_digits=20),
+        ),
+        migrations.AlterField(
+            model_name="tracking",
+            name="taxes",
+            field=models.DecimalField(decimal_places=2, max_digits=20),
+        ),
+        migrations.AlterField(
+            model_name="tracking",
+            name="value",
+            field=models.DecimalField(decimal_places=2, max_digits=20),
+        ),
+        migrations.AlterField(
+            model_name="trackingitem",
+            name="buy_value",
+            field=models.DecimalField(decimal_places=2, max_digits=20),
+        ),
+    ]

{aa_buybackprogram-2.1.0 → aa_buybackprogram-2.3.0}/buybackprogram/models.py

@@ -811,9 +811,13 @@ class Owner(models.Model):
             notes.append(note)
 
         # If our tracked price is different than the actual contract price
-        if tracking.net_price >= 0 and tracking.net_price != contract.price:
+        # We round the numbers in here as most players do not use decimals ingame and the prices might be off by the digits
+        tracking_net_price = round(tracking.net_price)
+        contract_net_price = round(contract.price)
+
+        if tracking_net_price >= 0 and tracking_net_price != contract_net_price:
             # If contract price is bellow tracked price
-            if contract.price > tracking.net_price:
+            if contract_net_price > tracking_net_price:
                 note = ContractNotification(
                     contract=contract,
                     icon="fa-dollar-sign",
@@ -1102,9 +1106,9 @@ class Program(models.Model):
     )
 
     compression_price_dencity_modifier = models.BooleanField(
-        verbose_name="Price density modifier for compressable items",
+        verbose_name="Ore volume based on compressed volume",
         default=False,
-        help_text="Should we apply price density calculations for items that can be compressed such as ore and ice. If set to False price density tax is not applied on any items that can be compressed.",
+        help_text="Should we use compressed volume for items that can be compressed such as ore and ice in fuel cost and price dencity calculations. If set to False the raw volume is used for volume calculations if the item does not have a compressed price variant available from the use compressed value setting.",
     )
 
     price_dencity_treshold = models.IntegerField(
@@ -1284,8 +1288,8 @@ class ItemPrices(models.Model):
         on_delete=models.deletion.CASCADE,
         unique=True,
     )
-    buy = models.BigIntegerField()
-    sell = models.BigIntegerField()
+    buy = models.DecimalField(max_digits=20, decimal_places=2)
+    sell = models.DecimalField(max_digits=20, decimal_places=2)
     updated = models.DateTimeField()
 
 
@@ -1301,10 +1305,10 @@ class Contract(models.Model):
     issuer_id = models.IntegerField()
     start_location_id = models.BigIntegerField(null=True)
     location_name = models.CharField(max_length=128, null=True)
-    price = models.BigIntegerField()
+    price = models.DecimalField(max_digits=20, decimal_places=2)
     status = models.CharField(max_length=30)
     title = models.CharField(max_length=128)
-    volume = models.BigIntegerField()
+    volume = models.DecimalField(max_digits=20, decimal_places=2)
     no_tracking = models.BooleanField(default=False)
 
     def __str__(self) -> str:
@@ -1370,11 +1374,13 @@ class Tracking(models.Model):
         on_delete=models.deletion.CASCADE,
         related_name="+",
     )
-    value = models.BigIntegerField(null=False)
-    taxes = models.BigIntegerField(null=False)
-    hauling_cost = models.BigIntegerField(null=False)
-    donation = models.BigIntegerField(null=True, blank=True)
-    net_price = models.BigIntegerField(null=False)
+    value = models.DecimalField(max_digits=20, decimal_places=2, null=False)
+    taxes = models.DecimalField(max_digits=20, decimal_places=2, null=False)
+    hauling_cost = models.DecimalField(max_digits=20, decimal_places=2, null=False)
+    donation = models.DecimalField(
+        max_digits=20, decimal_places=2, null=True, blank=True
+    )
+    net_price = models.DecimalField(max_digits=20, decimal_places=2, null=False)
     tracking_number = models.CharField(max_length=32)
     created_at = models.DateTimeField(null=True, blank=True)
     additional_notes = models.TextField(null=True, blank=True)
@@ -1393,7 +1399,7 @@ class TrackingItem(models.Model):
         help_text="Item type information",
     )
 
-    buy_value = models.BigIntegerField(null=False)
+    buy_value = models.DecimalField(max_digits=20, decimal_places=2, null=False)
 
     quantity = models.IntegerField()
 

{aa_buybackprogram-2.1.0 → aa_buybackprogram-2.3.0}/buybackprogram/tasks.py

@@ -168,18 +168,16 @@ def update_all_prices():
                 # Check what prices we should use either instant prices or top 5% percentile
                 if not BUYBACKPROGRAM_PRICE_INSTANT_PRICES:
                     # Get the price values from the API data
-                    buy = int(
-                        float(market_data[str(price.eve_type_id)]["buy"]["percentile"])
+                    buy = float(
+                        market_data[str(price.eve_type_id)]["buy"]["percentile"]
                     )
-                    sell = int(
-                        float(market_data[str(price.eve_type_id)]["sell"]["percentile"])
+                    sell = float(
+                        market_data[str(price.eve_type_id)]["sell"]["percentile"]
                     )
                 else:
                     # Get the price values from the API data
-                    buy = int(float(market_data[str(price.eve_type_id)]["buy"]["max"]))
-                    sell = int(
-                        float(market_data[str(price.eve_type_id)]["sell"]["min"])
-                    )
+                    buy = float(market_data[str(price.eve_type_id)]["buy"]["max"])
+                    sell = float(market_data[str(price.eve_type_id)]["sell"]["min"])
 
             # If API did not return any values we remove prices for the item
             else:

{aa_buybackprogram-2.1.0 → aa_buybackprogram-2.3.0}/buybackprogram/templates/buybackprogram/partials/calculate/contract_settings.html

@@ -19,10 +19,10 @@
             <tr>
                 <th>{% trans "I will receive:" %}</th>
                 {% if contract_price_data.contract_net_total >= 0%}
-                    <td data-type="copy_value">{{contract_price_data.contract_net_total|floatformat:0|intcomma}}</td>
+                    <td data-type="copy_value">{{contract_price_data.contract_net_total|floatformat:2|intcomma}}</td>
                     <td><button data-type="copy"><i class="fa-solid fa-copy"></i></button></td>
                 {% else %}
-                    <td>0 ISK <i><s>{{contract_price_data.contract_net_total|floatformat:0|intcomma}} ISK</s></i><td>
+                    <td>0 ISK <i><s>{{contract_price_data.contract_net_total|floatformat:2|intcomma}} ISK</s></i><td>
                 {% endif %}
 
 

{aa_buybackprogram-2.1.0 → aa_buybackprogram-2.3.0}/buybackprogram/templates/buybackprogram/partials/calculate/invoice.html

@@ -9,34 +9,34 @@
             </tr>
             <tr>
                 <th>{% trans "Price before expenses" %}</th>
-                <td>{{contract_price_data.total_all_items_raw|floatformat:0|intcomma}} ISK</td>
+                <td>{{contract_price_data.total_all_items_raw|floatformat:2|intcomma}} ISK</td>
             </tr>
             <tr>
                 <th>{% trans "Program taxes" %}</th>
-              <td>{{contract_price_data.total_tax_amount|floatformat:0|intcomma}} ISK</td>
+              <td>{{contract_price_data.total_tax_amount|floatformat:2|intcomma}} ISK</td>
             </tr>
             <tr>
                 <th>{% trans "Total volume" %}</th>
-                <td>{{contract_price_data.contract_total_volume|floatformat:0|intcomma}} m³</td>
+                <td>{{contract_price_data.contract_total_volume|floatformat:2|intcomma}} m³</td>
             </tr>
             {% if program.hauling_fuel_cost > 0 %}
             <tr>
                 <th>{% trans "Hauling cost" %}</th>
-                <td>{{contract_price_data.total_hauling_cost|floatformat:0|intcomma}} ISK @ {{contract_price_data.hauling_cost|floatformat:0|intcomma}} ISK / m³</td>
+                <td>{{contract_price_data.total_hauling_cost|floatformat:2|intcomma}} ISK @ {{contract_price_data.hauling_cost|floatformat:2|intcomma}} ISK / m³</td>
             </tr>
             {% endif %}
             {% if contract_price_data.total_donation_amount %}
             <tr>
                 <th>{% trans "Donation amount" %}</th>
-                <td>{{contract_price_data.total_donation_amount|floatformat:0|intcomma}} ISK <i> @ {{donation}} %</i></td>
+                <td>{{contract_price_data.total_donation_amount|floatformat:2|intcomma}} ISK <i> @ {{donation}} %</i></td>
             </tr>
             {% endif %}
             <tr>
                 <th style="border-top:2px dotted black;">Net price</th>
                 {% if contract_price_data.contract_net_total >= 0%}
-                    <td style="border-top:2px dotted black;">{{contract_price_data.contract_net_total|floatformat:0|intcomma }} ISK</td>
+                    <td style="border-top:2px dotted black;">{{contract_price_data.contract_net_total|floatformat:2|intcomma }} ISK</td>
                 {% else %}
-                    <td style="border-top:2px dotted black;">0 ISK <i><s>{{contract_price_data.contract_net_total|floatformat:0|intcomma }} ISK</s></i><td>
+                    <td style="border-top:2px dotted black;">0 ISK <i><s>{{contract_price_data.contract_net_total|floatformat:2|intcomma }} ISK</s></i><td>
                 {% endif %}
             </tr>
 

{aa_buybackprogram-2.1.0 → aa_buybackprogram-2.3.0}/buybackprogram/templates/buybackprogram/partials/calculate/item_details.html

@@ -32,11 +32,11 @@
 
                             </td>
                             <td>{{ item.item_values.quantity|intcomma }}</td>
-                            <td>{{ item.item_prices.type_prices.buy|floatformat:0|intcomma}} / {{ item.item_prices.type_prices.sell|floatformat:0|intcomma|price }}</td>
-                            <td>{{ item.item_values.raw_value|floatformat:0|intcomma|price }}</td>
+                            <td>{{ item.item_prices.type_prices.buy|floatformat:2|intcomma}} / {{ item.item_prices.type_prices.sell|floatformat:2|intcomma|price }}</td>
+                            <td>{{ item.item_values.raw_value|floatformat:2|intcomma|price }}</td>
                             <td>{{ item.item_values.tax_value|floatformat:2|tax }}</td>
-                            <td>{{ item.item_values.unit_value|floatformat:0|intcomma|price }}</td>
-                            <td>{{ item.item_values.buy_value|floatformat:0|intcomma|price }}</td>
+                            <td>{{ item.item_values.unit_value|floatformat:2|intcomma|price }}</td>
+                            <td>{{ item.item_values.buy_value|floatformat:2|intcomma|price }}</td>
                             <td>
                                 {% for note in item.item_prices.notes%}
                                     <i style="color: {{note.color}};" class="fas {{note.icon}}" title="{{note.message}}"></i>
@@ -54,11 +54,11 @@
                             <tr class="collapse no-border" id="{{ item.item_values.normal.id }}-raw">
                                 <td style="padding-left: 30px;">{{ item.item_values.name }}</td>
                                 <td>{{ item.item_values.quantity|intcomma }}</td>
-                                <td>{{ item.item_prices.type_prices.buy|floatformat:0|intcomma }} / {{ item.item_prices.type_prices.sell|floatformat:0|intcomma|price }}</td>
-                                <td>{{ item.item_values.normal.raw_value|floatformat:0|intcomma|price }}</td>
+                                <td>{{ item.item_prices.type_prices.buy|floatformat:2|intcomma }} / {{ item.item_prices.type_prices.sell|floatformat:2|intcomma|price }}</td>
+                                <td>{{ item.item_values.normal.raw_value|floatformat:2|intcomma|price }}</td>
                                 <td>{{ item.item_values.normal.total_tax|floatformat:2|tax }}</td>
-                                <td>{{ item.item_values.normal.unit_value|floatformat:0|intcomma|price }}</td>
-                                <td class="buy-value-{{item.item_values.normal.is_buy_value}}">{{ item.item_values.normal.value|floatformat:0|intcomma|price }}</td>
+                                <td>{{ item.item_values.normal.unit_value|floatformat:2|intcomma|price }}</td>
+                                <td class="buy-value-{{item.item_values.normal.is_buy_value}}">{{ item.item_values.normal.value|floatformat:2|intcomma|price }}</td>
                                 <td>
                                     {% for note in item.item_values.normal.notes %}
                                         <i style="color: {{note.color}};" class="fas {{note.icon}}" title="{{note.message}}"></i>
@@ -77,11 +77,11 @@
                             <tr class="collapse no-border" id="{{ item.item_values.normal.id }}-npc">
                                 <td style="padding-left: 30px;">{{item.item_values.npc.name}}</td>
                                 <td>{{item.item_values.npc.quantity|intcomma}}</td>
-                                <td>{{item.item_values.npc.buy|floatformat:0|intcomma}} / {{item.item_values.npc.sell|floatformat:0|intcomma|price}}</td>
-                                <td>{{ item.item_values.npc.raw_value|floatformat:0|intcomma|price }}</td>
+                                <td>{{item.item_values.npc.buy|floatformat:2|intcomma}} / {{item.item_values.npc.sell|floatformat:2|intcomma|price}}</td>
+                                <td>{{ item.item_values.npc.raw_value|floatformat:2|intcomma|price }}</td>
                                 <td>{{item.item_values.npc.total_tax|floatformat:2|tax}}</td>
-                                <td>{{item.item_values.npc.unit_value|floatformat:0|intcomma|price}}</td>
-                                <td class="buy-value-{{item.item_values.npc.is_buy_value}}">{{item.item_values.npc.value|floatformat:0|intcomma|price}}</td>
+                                <td>{{item.item_values.npc.unit_value|floatformat:2|intcomma|price}}</td>
+                                <td class="buy-value-{{item.item_values.npc.is_buy_value}}">{{item.item_values.npc.value|floatformat:2|intcomma|price}}</td>
                                 <td>
                                     {% for note in item.item_values.npc.notes%}
                                         <i style="color: {{note.color}};" class="fas {{note.icon}}" title="{{note.message}}"></i>
@@ -100,11 +100,11 @@
                             <tr class="collapse no-border" id="{{ item.item_values.normal.id }}-compressed">
                                 <td style="padding-left: 30px;">{{item.item_values.compressed.name}}</td>
                                 <td>{{item.item_values.compressed.quantity|intcomma}}</td>
-                                <td>{{item.item_values.compressed.buy|floatformat:0|intcomma}} / {{item.item_values.compressed.sell|floatformat:0|intcomma|price}}</td>
-                                <td>{{item.item_values.compressed.raw_value|floatformat:0|intcomma|price}}</td>
+                                <td>{{item.item_values.compressed.buy|floatformat:2|intcomma}} / {{item.item_values.compressed.sell|floatformat:2|intcomma|price}}</td>
+                                <td>{{item.item_values.compressed.raw_value|floatformat:2|intcomma|price}}</td>
                                 <td>{{item.item_values.compressed.total_tax|floatformat:2|tax}}</td>
-                                <td>{{item.item_values.compressed.unit_value|floatformat:0|intcomma|price}}</td>
-                                <td class="buy-value-{{item.item_values.compressed.is_buy_value}}">{{item.item_values.compressed.value|floatformat:0|intcomma|price}}</td>
+                                <td>{{item.item_values.compressed.unit_value|floatformat:2|intcomma|price}}</td>
+                                <td class="buy-value-{{item.item_values.compressed.is_buy_value}}">{{item.item_values.compressed.value|floatformat:2|intcomma|price}}</td>
                                 <td>
                                     {% for note in item.item_values.compressed.notes%}
                                         <i style="color: {{note.color}};" class="fas {{note.icon}}" title="{{note.message}}"></i>
@@ -124,11 +124,11 @@
                                 <tr class="collapse no-border" id="{{ item.item_values.normal.id }}-refined{{ forloop.counter }}">
                                     <td style="padding-left: 30px;">{{material.name}}</td>
                                     <td>{{material.quantity|floatformat:2}}</td>
-                                    <td>{{material.buy|floatformat:0|intcomma}} / {{material.sell|floatformat:0|intcomma|price}}</td>
-                                    <td>{{material.raw_value|floatformat:0|intcomma|price}}</td>
+                                    <td>{{material.buy|floatformat:2|intcomma}} / {{material.sell|floatformat:2|intcomma|price}}</td>
+                                    <td>{{material.raw_value|floatformat:2|intcomma|price}}</td>
                                     <td>{{material.total_tax|floatformat:2|tax}}</td>
-                                    <td>{{material.unit_value|floatformat:0|intcomma|price}}</td>
-                                    <td>{{material.value|floatformat:0|intcomma|price}}</td>
+                                    <td>{{material.unit_value|floatformat:2|intcomma|price}}</td>
+                                    <td>{{material.value|floatformat:2|intcomma|price}}</td>
                                     <td>
                                     {% for note in material.notes%}
                                         <i style="color: {{note.color}};" class="fas {{note.icon}}" title="{{note.message}}"></i>
@@ -138,10 +138,10 @@
                             {% endfor %}
                             <tr class="collapse no-border" id="{{ item.item_values.normal.id }}-refined-total">
                                 <td colspan="3" style="padding-left: 30px;border-top:1px dotted grey;">{% trans "Total value" %} <i>@ {{program.refining_rate}} refining rate</i></td>
-                                <td style="border-top:1px dotted grey;">{{item.item_values.refined.raw_value|floatformat:0|intcomma|price}}</td>
+                                <td style="border-top:1px dotted grey;">{{item.item_values.refined.raw_value|floatformat:2|intcomma|price}}</td>
                                 <td style="border-top:1px dotted grey;">{{item.item_values.refined.total_tax|floatformat:2|tax}}</td>
-                                <td style="border-top:1px dotted grey;">{{item.item_values.refined.unit_value|floatformat:0|intcomma|price}}</td>
-                                <td colspan="2" class="buy-value-{{item.item_values.refined.is_buy_value}}" style="border-top:1px dotted grey;">{{item.item_values.refined.value|floatformat:0|intcomma|price}}</td>
+                                <td style="border-top:1px dotted grey;">{{item.item_values.refined.unit_value|floatformat:2|intcomma|price}}</td>
+                                <td colspan="2" class="buy-value-{{item.item_values.refined.is_buy_value}}" style="border-top:1px dotted grey;">{{item.item_values.refined.value|floatformat:2|intcomma|price}}</td>
                             </tr>
                         {% endif %}
                         <tr class="collapse no-border">

{aa_buybackprogram-2.1.0 → aa_buybackprogram-2.3.0}/buybackprogram/templates/buybackprogram/partials/details/contract-info.html

@@ -33,7 +33,7 @@
             </tr>
             <tr>
                 <th >{% trans "Asking price" %}</th>
-                <td>{{contract.price|floatformat:0|intcomma}} ISK</td>
+                <td>{{contract.price|floatformat:2|intcomma}} ISK</td>
             </tr>
         </tbody>
     </table>

{aa_buybackprogram-2.1.0 → aa_buybackprogram-2.3.0}/buybackprogram/templates/buybackprogram/partials/details/invoice.html

@@ -6,26 +6,26 @@
             <table id="contract" class="table">
                 <tr>
                     <th>{% trans "Price before expenses" %}</th>
-                    <td>{{tracking.value|floatformat:0|intcomma}} ISK</td>
+                    <td>{{tracking.value|floatformat:2|intcomma}} ISK</td>
                 </tr>
                 <tr>
                     <th>{% trans "Program taxes" %}</th>
-                  <td>{{tracking.taxes|floatformat:0|intcomma}} ISK</td>
+                  <td>{{tracking.taxes|floatformat:2|intcomma}} ISK</td>
                 </tr>
                 <tr>
                     <th>{% trans "Hauling cost" %}</th>
-                    <td>{{tracking.hauling_cost|floatformat:0|intcomma}} ISK</td>
+                    <td>{{tracking.hauling_cost|floatformat:2|intcomma}} ISK</td>
                 </tr>
                 <tr>
                     <th>{% trans "Donation amount" %}</th>
-                    <td>{{tracking.donation|floatformat:0|intcomma}} ISK <i></i></td>
+                    <td>{{tracking.donation|floatformat:2|intcomma}} ISK <i></i></td>
                 </tr>
                 <tr>
                     <th style="border-top:2px dotted black;">Net price</th>
                     {% if tracking.net_price >= 0 %}
-                        <td style="border-top:2px dotted black;">{{tracking.net_price|floatformat:0|intcomma }} ISK</td>
+                        <td style="border-top:2px dotted black;">{{tracking.net_price|floatformat:2|intcomma }} ISK</td>
                     {% else %}
-                        <td style="border-top:2px dotted black;">0 ISK <i><s>{{tracking.net_price|floatformat:0|intcomma }} ISK</s></i><td>
+                        <td style="border-top:2px dotted black;">0 ISK <i><s>{{tracking.net_price|floatformat:2|intcomma }} ISK</s></i><td>
                     {% endif %}
                 </tr>
 

{aa_buybackprogram-2.1.0 → aa_buybackprogram-2.3.0}/buybackprogram/templates/buybackprogram/partials/details/tabs/original-items.html

@@ -17,7 +17,7 @@
                         <tr>
                             <td><img class="item-icon" src="https://image.eveonline.com/Type/{{item.eve_type.id}}_64.png" />{{item.eve_type.name}}</td>
                             <td>{{item.quantity|intcomma}}</td>
-                            <td>{{item.buy_value|floatformat:0|intcomma}} ISK</td>
+                            <td>{{item.buy_value|floatformat:2|intcomma}} ISK</td>
                             <td>
                                 {% for note in item.notes %}
                                     <i style="color: {{note.color}};" class="fas {{note.icon}}" title="{{note.message}}"></i>

{aa_buybackprogram-2.1.0 → aa_buybackprogram-2.3.0}/buybackprogram/templates/buybackprogram/partials/stats/summary.html

@@ -7,13 +7,13 @@
             <th>{% trans "Outstanding count:" %}</th>
             <td>{{values.outstanding_count}}</td>
             <th>{% trans "Outstanding value:" %}</th>
-            <td>{{values.outstanding|floatformat:0|intcomma|price}}</td>
+            <td>{{values.outstanding|floatformat:2|intcomma|price}}</td>
         </tr>
         <tr>
             <th>{% trans "Total bought count:" %}</th>
             <td>{{values.finished_count}}</td>
             <th>{% trans "Total bought:" %}</th>
-            <td>{{values.finished|floatformat:0|intcomma|price}}</td>
+            <td>{{values.finished|floatformat:2|intcomma|price}}</td>
         </tr>
         {% if BUYBACKPROGRAM_TRACK_PREFILL_CONTRACTS %}
             <tr>

{aa_buybackprogram-2.1.0 → aa_buybackprogram-2.3.0}/buybackprogram/templates/buybackprogram/partials/stats/tabs/finished.html

@@ -31,7 +31,7 @@
                             <td>{{tracking.contract.date_issued|timesince }}</td>
                             <td>{{tracking.contract.status}}</td>
                             <td>{{tracking.tracking_number}}</td>
-                            <td>{{tracking.contract.price|floatformat:0|intcomma|price}}</td>
+                            <td>{{tracking.contract.price|floatformat:2|intcomma|price}}</td>
 
                             <td>
                                 {% for note in tracking.contract.notes %}

{aa_buybackprogram-2.1.0 → aa_buybackprogram-2.3.0}/buybackprogram/templates/buybackprogram/partials/stats/tabs/outstanding.html

@@ -31,7 +31,7 @@
                             <td>{{tracking.contract.date_issued|timesince }}</td>
                             <td>{{tracking.contract.status}}</td>
                             <td>{{tracking.tracking_number}}</td>
-                            <td>{{tracking.contract.price|floatformat:0|intcomma|price}}</td>
+                            <td>{{tracking.contract.price|floatformat:2|intcomma|price}}</td>
 
                             <td>
                                 {% for note in tracking.contract.notes %}

{aa_buybackprogram-2.1.0 → aa_buybackprogram-2.3.0}/buybackprogram/templates/buybackprogram/partials/stats/tabs/untracked.html

@@ -32,7 +32,7 @@
                                 <td>{{contract.date_issued|timesince }}</td>
                                 <td>{{contract.status}}</td>
                                 <td>{{contract.title}}</td>
-                                <td>{{contract.price|floatformat:0|intcomma|price}}</td>
+                                <td>{{contract.price|floatformat:2|intcomma|price}}</td>
 
                                 <td colspan="2">
                                     {% for note in contract.notes %}

{aa_buybackprogram-2.1.0 → aa_buybackprogram-2.3.0}/buybackprogram/views/programs.py

@@ -182,20 +182,6 @@ def location_add(request):
 
             owner = Owner.objects.filter(user=request.user).first()
 
-            try:
-                structure_id = int(structure_id)
-            except ValueError:
-                form.add_error("structure_id", "Structure ID must be a valid number.")
-                messages_plus.error(
-                    request,
-                    "Error: Structure ID must be a valid number.",
-                )
-                return render(
-                    request,
-                    "buybackprogram/location_add.html",
-                    {"form": form, "locations": locations},
-                )
-
             created = Location.objects.update_or_create(
                 eve_solar_system=eve_solar_system,
                 name=name,