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

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

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

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

{aa_buybackprogram-2.1.0 → 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.1.0 → aa_buybackprogram-2.2.0}/buybackprogram/helpers.py

@@ -1013,7 +1013,7 @@ 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):
                     compressed_version = EveType.objects.filter(
                         id=item["item_prices"]["compression_prices"]["id"]
                     ).first()

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.1.0 → 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.1.0 → aa_buybackprogram-2.2.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,