From 26ad2d699ab3ca7c109b4d5c6ebc2bcab1809c37 Mon Sep 17 00:00:00 2001
From: Celestino Rey <creylopez@yahoo.es>
Date: Thu, 29 Aug 2024 11:06:50 +0200
Subject: [PATCH] Calcula bien el descuento

---
 RepostajesDj/.phcode.json                     |   6 ++
 RepostajesDj/K8S/Makefile                     |   2 +-
 RepostajesDj/vehiculos/db.sqlite3             | Bin 0 -> 143360 bytes
 .../vehiculos/mediafiles/vehiculos/bmw.png    | Bin 0 -> 9760 bytes
 .../repostajes/migrations/0001_initial.py     |  60 ++++++++++++++++++
 RepostajesDj/vehiculos/repostajes/views.py    |  15 ++++-
 RepostajesDj/vehiculos/vehiculos/settings.py  |   3 +-
 7 files changed, 82 insertions(+), 4 deletions(-)
 create mode 100644 RepostajesDj/.phcode.json
 create mode 100644 RepostajesDj/vehiculos/db.sqlite3
 create mode 100644 RepostajesDj/vehiculos/mediafiles/vehiculos/bmw.png
 create mode 100644 RepostajesDj/vehiculos/repostajes/migrations/0001_initial.py

diff --git a/RepostajesDj/.phcode.json b/RepostajesDj/.phcode.json
new file mode 100644
index 0000000..79c9cd4
--- /dev/null
+++ b/RepostajesDj/.phcode.json
@@ -0,0 +1,6 @@
+{
+    "livePreviewUseDevServer": false,
+    "livePreviewServerProjectPath": "/",
+    "livePreviewHotReloadSupported": false,
+    "livePreviewFramework": "Custom"
+}
\ No newline at end of file
diff --git a/RepostajesDj/K8S/Makefile b/RepostajesDj/K8S/Makefile
index 9086c92..a8cd095 100644
--- a/RepostajesDj/K8S/Makefile
+++ b/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
diff --git a/RepostajesDj/vehiculos/db.sqlite3 b/RepostajesDj/vehiculos/db.sqlite3
new file mode 100644
index 0000000000000000000000000000000000000000..9085d8594ad1bf22c2739cfb99bcc100dd2aab7e
GIT binary patch
literal 143360
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
Q00B;5*gECf|NH;{3+eRqA^-pY

literal 0
HcmV?d00001

diff --git a/RepostajesDj/vehiculos/mediafiles/vehiculos/bmw.png b/RepostajesDj/vehiculos/mediafiles/vehiculos/bmw.png
new file mode 100644
index 0000000000000000000000000000000000000000..e6e2c254e5e7c1bdb2d346f709095d3f4ffa8366
GIT binary patch
literal 9760
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

literal 0
HcmV?d00001

diff --git a/RepostajesDj/vehiculos/repostajes/migrations/0001_initial.py b/RepostajesDj/vehiculos/repostajes/migrations/0001_initial.py
new file mode 100644
index 0000000..922476f
--- /dev/null
+++ b/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,
+            },
+        ),
+    ]
diff --git a/RepostajesDj/vehiculos/repostajes/views.py b/RepostajesDj/vehiculos/repostajes/views.py
index 4786fb7..46702d3 100644
--- a/RepostajesDj/vehiculos/repostajes/views.py
+++ b/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()
 
diff --git a/RepostajesDj/vehiculos/vehiculos/settings.py b/RepostajesDj/vehiculos/vehiculos/settings.py
index c8d8184..27058c4 100644
--- a/RepostajesDj/vehiculos/vehiculos/settings.py
+++ b/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(" ")