aa-buybackprogram 2.0.1__tar.gz → 2.2.0__tar.gz

{aa_buybackprogram-2.0.1 → aa_buybackprogram-2.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aa-buybackprogram
-Version: 2.0.1
+Version: 2.2.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.0.1 → aa_buybackprogram-2.2.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.0.1 → aa_buybackprogram-2.2.0}/buybackprogram/__init__.py

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

aa_buybackprogram-2.2.0/buybackprogram/constants.py

@@ -0,0 +1,57 @@
+# Includes all asteroids, moon ore and ice. All items that can be compressed or refined for minerals*
+ORE_EVE_GROUPS = [
+    450,  # Arkonor
+    451,  # Bistot
+    452,  # Crokite
+    453,  # Ochre
+    454,  # Hedbergite
+    455,  # Hemorphite
+    456,  # Jaspet
+    457,  # Kernite
+    458,  # Plagioclase
+    459,  # Pyroxeres
+    460,  # Scordite
+    461,  # Spodumain
+    462,  # Veldspar
+    465,  # Ice
+    467,  # Gneiss
+    468,  # Mercoxit
+    469,  # Omber
+    1884,  # Zeolites
+    1911,  # Raspite
+    1920,  # Cobaltite
+    1921,  # Otavite
+    1922,  # Carnotite
+    1923,  # Xenotime
+    2024,  # Amethystic Crystallite
+    2029,  # ??
+    4029,  # Talassonite
+    4030,  # Rakovene
+    4031,  # Bezdnacine
+    4094,  # ??
+    4513,  # Mordunium
+    4514,  # Ytirium
+    4515,  # Eifyrium
+    4516,  # Ducinium
+    4759,  # Griemeer
+    4758,  # Hezorime
+    4755,  # Kylixium
+    4756,  # Nocxite
+    4757,  # Ueganite
+]
+
+OPE_EVE_GROUPS = [493]
+
+BONDS_EVE_GROUPS = [1248]
+
+BLUE_LOOT_TYPE_IDS = [
+    30744,
+    30745,
+    30746,
+    30747,
+]
+
+RED_LOOT_TYPE_IDS = [
+    48121,
+    60459,
+]

{aa_buybackprogram-2.0.1 → aa_buybackprogram-2.2.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.0.1 → aa_buybackprogram-2.2.0}/buybackprogram/helpers.py

@@ -477,11 +477,15 @@ def get_item_values(item_type, item_prices, program):
         )
 
         if not item_type.volume <= 0:
-            price_dencity = price / item_type.volume
+            price_dencity = price / item_type.packaged_volume
         else:
             price_dencity = False
         price_dencity_tax = get_price_dencity_tax(
-            program, price, item_type.volume, quantity, is_ore(item_type.eve_group.id)
+            program,
+            price,
+            item_type.packaged_volume,
+            quantity,
+            is_ore(item_type.eve_group.id),
         )
         program_tax = program.tax
         item_tax = get_item_tax(program, item_type.id)
@@ -574,14 +578,16 @@ def get_item_values(item_type, item_prices, program):
             )
 
             if not item_type.volume <= 0:
-                price_dencity = item_prices["raw_prices"]["buy"] / item_type.volume
+                price_dencity = (
+                    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"],
-                item_type.volume,
+                item_type.packaged_volume,
                 item_prices["raw_prices"]["quantity"],
                 is_ore(item_type.eve_group.id),
             )
@@ -783,7 +789,11 @@ def get_item_values(item_type, item_prices, program):
         else:
             price_dencity = False
         price_dencity_tax = get_price_dencity_tax(
-            program, price, item_type.volume, quantity, is_ore(item_type.eve_group.id)
+            program,
+            price,
+            item_type.packaged_volume,
+            quantity,
+            is_ore(item_type.eve_group.id),
         )
         program_tax = program.tax
         item_tax = get_item_tax(program, item_type.id)
@@ -976,6 +986,7 @@ def get_item_buy_value(buyback_data, program, donation):
     contract_net_total = False
     total_donation = False
     tota_all_items_raw = 0
+    total_volume = 0
 
     # Get a grand total value of all buy prices
     for item in buyback_data:
@@ -999,7 +1010,10 @@ def get_item_buy_value(buyback_data, program, donation):
         for item in buyback_data:
             if has_buy_price(item["item_prices"]):
                 # Check if compressed price is used. If yes we will use compression price density. If not we will use raw price density.
-                if item["item_prices"]["compression_prices"]:
+                if (
+                    item["item_prices"]["compression_prices"]
+                    and program.use_compressed_value
+                ) or (program.compression_price_dencity_modifier and is_ore):
                     compressed_version = EveType.objects.filter(
                         id=item["item_prices"]["compression_prices"]["id"]
                     ).first()
@@ -1017,7 +1031,7 @@ def get_item_buy_value(buyback_data, program, donation):
                         % (item["type_data"])
                     )
 
-                    item_volume = item["type_data"].volume
+                    item_volume = item["type_data"].packaged_volume
 
                 quantity = item["item_values"]["quantity"]
                 hauling_cost = item_volume * program.hauling_fuel_cost * quantity
@@ -1028,6 +1042,7 @@ def get_item_buy_value(buyback_data, program, donation):
                 )
 
                 total_hauling_cost += hauling_cost
+                total_volume += item_volume * quantity
 
                 logger.debug(
                     "Final: Hauling cost %s m³ of %s is %s ISK"
@@ -1055,6 +1070,7 @@ def get_item_buy_value(buyback_data, program, donation):
         "hauling_cost": program.hauling_fuel_cost,
         "total_hauling_cost": total_hauling_cost,
         "contract_net_total": contract_net_total,
+        "contract_total_volume": total_volume,
     }
 
     return contract_net_prices

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

@@ -0,0 +1,18 @@
+# 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.0.1 → aa_buybackprogram-2.2.0}/buybackprogram/models.py

@@ -1102,9 +1102,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(

{aa_buybackprogram-2.0.1 → aa_buybackprogram-2.2.0}/buybackprogram/templates/buybackprogram/partials/calculate/invoice.html

@@ -15,6 +15,10 @@
                 <th>{% trans "Program taxes" %}</th>
               <td>{{contract_price_data.total_tax_amount|floatformat:0|intcomma}} ISK</td>
             </tr>
+            <tr>
+                <th>{% trans "Total volume" %}</th>
+                <td>{{contract_price_data.contract_total_volume|floatformat:0|intcomma}} m³</td>
+            </tr>
             {% if program.hauling_fuel_cost > 0 %}
             <tr>
                 <th>{% trans "Hauling cost" %}</th>

{aa_buybackprogram-2.0.1 → aa_buybackprogram-2.2.0}/buybackprogram/views/stats.py

@@ -19,6 +19,7 @@ from buybackprogram.notes import (
     note_quantity_missing_from_contract,
     note_quantity_missing_from_tracking,
 )
+from buybackprogram.utils import messages_plus
 
 from ..models import (
     Contract,
@@ -157,9 +158,19 @@ def program_performance(request, program_pk):
     filename = f"program_performance_{program_pk}.json"
     file_path = os.path.join(static_path, filename)
 
-    if os.path.exists(file_path):
+    try:
+        # Try to open the file and load the JSON data
         with open(file_path, "r") as file:
             context = json.load(file)
+    except FileNotFoundError:
+        messages_plus.error(
+            request,
+            "Error: The performance data file is missing for this program. Please generate the report first.",
+        )
+        return render(
+            request,
+            "buybackprogram/performance.html",
+        )
 
     return render(request, "buybackprogram/performance.html", context)
 

aa_buybackprogram-2.0.1/buybackprogram/constants.py

@@ -1,52 +0,0 @@
-# Includes all asteroids, moon ore and ice. All items that can be compressed or refined for minerals*
-ORE_EVE_GROUPS = [
-    450,
-    451,
-    452,
-    453,
-    454,
-    455,
-    456,
-    457,
-    458,
-    459,
-    460,
-    461,
-    462,
-    465,
-    467,
-    468,
-    469,
-    1884,
-    1911,
-    1920,
-    1921,
-    1922,
-    1923,
-    2024,
-    2029,
-    4029,
-    4030,
-    4031,
-    4094,
-    4513,
-    4514,
-    4515,
-    4516,
-]
-
-OPE_EVE_GROUPS = [493]
-
-BONDS_EVE_GROUPS = [1248]
-
-BLUE_LOOT_TYPE_IDS = [
-    30744,
-    30745,
-    30746,
-    30747,
-]
-
-RED_LOOT_TYPE_IDS = [
-    48121,
-    60459,
-]