Calcula bien el descuento

RepostajesDj/.phcode.json

@@ -0,0 +1,6 @@
+{
+    "livePreviewUseDevServer": false,
+    "livePreviewServerProjectPath": "/",
+    "livePreviewHotReloadSupported": false,
+    "livePreviewFramework": "Custom"
+}

RepostajesDj/K8S/Makefile

@@ -1,7 +1,7 @@
 export ARQUITECTURA := $(shell lscpu |grep itectur | tr -d ' '| cut -f2 -d':')
 #export REGISTRY=registry.cube.local
 export REGISTRY=registry.reymota.es
-export IMG_VERSION = 0.21
+export IMG_VERSION = 0.23
 export IMG_NGINX_VERSION = 1.0
 
 # limpia todo

RepostajesDj/vehiculos/repostajes/migrations/0001_initial.py

@@ -0,0 +1,60 @@
+# Generated by Django 4.2 on 2024-08-29 08:38
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('auth', '0012_alter_user_first_name_max_length'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Vehiculo',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('marca', models.CharField(max_length=200)),
+                ('modelo', models.CharField(max_length=200)),
+                ('matricula', models.CharField(max_length=200)),
+                ('foto', models.ImageField(blank=True, null=True, upload_to='vehiculos/')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Repostaje',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('fecha', models.DateField()),
+                ('kms', models.DecimalField(blank=True, decimal_places=2, max_digits=10, null=True)),
+                ('litros', models.DecimalField(blank=True, decimal_places=2, max_digits=4, null=True)),
+                ('descuento', models.DecimalField(blank=True, decimal_places=2, max_digits=4, null=True)),
+                ('importe', models.DecimalField(blank=True, decimal_places=2, max_digits=6, null=True)),
+                ('precioxlitro', models.DecimalField(blank=True, decimal_places=2, max_digits=4, null=True)),
+                ('kmsrecorridos', models.DecimalField(blank=True, decimal_places=2, max_digits=5, null=True)),
+                ('consumo', models.DecimalField(blank=True, decimal_places=2, max_digits=4, null=True)),
+                ('vehiculo', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='repostajes.vehiculo')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='ReyMotaUser',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('password', models.CharField(max_length=128, verbose_name='password')),
+                ('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')),
+                ('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')),
+                ('email', models.EmailField(max_length=254, unique=True, verbose_name='email address')),
+                ('foto', models.ImageField(blank=True, upload_to='profile_images')),
+                ('is_staff', models.BooleanField(default=False)),
+                ('is_active', models.BooleanField(default=True)),
+                ('nombre', models.CharField(blank=True, max_length=200, null=True)),
+                ('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.group', verbose_name='groups')),
+                ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.permission', verbose_name='user permissions')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+    ]

RepostajesDj/vehiculos/repostajes/views.py

@@ -87,8 +87,19 @@ def nuevo_repostaje(request):
             if form.is_valid():
                 instancia = form.save(commit=False)
 
-                instancia.descuento = 99
-                instancia.precioxlitro = 99
+                print("nuevo_repostaje: descuento: ", instancia.descuento)
+
+                print("nuevo_repostaje: form_cleaned data: ", form.cleaned_data)
+
+                aplica_descuento = form.cleaned_data['aplica_descuento']
+
+                if aplica_descuento:
+                    instancia.descuento = float(instancia.importe) * 0.03
+                else:
+                    instancia.descuento = 0.0
+
+                instancia.importe = float(instancia.importe) - instancia.descuento
+                instancia.precioxlitro = instancia.importe / float(instancia.litros)
 
                 instancia.save()
 

RepostajesDj/vehiculos/vehiculos/settings.py

@@ -140,4 +140,5 @@ AUTH_USER_MODEL = "repostajes.ReyMotaUser"
 
 MEDIA_ROOT = os.path.join(BASE_DIR, 'mediafiles/')
 
-CSRF_TRUSTED_ORIGINS = os.environ.get("CSRF_TRUSTED_ORIGINS").split(" ")
+if DEBUG == 0:
+    CSRF_TRUSTED_ORIGINS = os.environ.get("CSRF_TRUSTED_ORIGINS").split(" ")