diff --git a/gestaoRaul/balcao/migrations/0001_initial.py b/gestaoRaul/balcao/migrations/0001_initial.py deleted file mode 100644 index 243b118..0000000 --- a/gestaoRaul/balcao/migrations/0001_initial.py +++ /dev/null @@ -1,30 +0,0 @@ -# Generated by Django 5.1.4 on 2024-12-10 01:19 - -import django.db.models.deletion -from django.db import migrations, models - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('clients', '0001_initial'), - ('mesas', '0001_initial'), - ('typePay', '0001_initial'), - ] - - operations = [ - migrations.CreateModel( - name='Comanda', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ('dt_open', models.DateTimeField(auto_now_add=True)), - ('dt_close', models.DateTimeField(blank=True, null=True)), - ('name', models.CharField(max_length=255)), - ('client', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='clients.client')), - ('mesa', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='mesas.mesa')), - ('type_pay', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='typePay.typepay')), - ], - ), - ] diff --git a/gestaoRaul/balcao/migrations/0002_productcomanda.py b/gestaoRaul/balcao/migrations/0002_productcomanda.py deleted file mode 100644 index 1e0d178..0000000 --- a/gestaoRaul/balcao/migrations/0002_productcomanda.py +++ /dev/null @@ -1,25 +0,0 @@ -# Generated by Django 5.1.4 on 2024-12-10 01:20 - -import django.db.models.deletion -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('comandas', '0001_initial'), - ('products', '0001_initial'), - ] - - operations = [ - migrations.CreateModel( - name='ProductComanda', - fields=[ - ('id', models.AutoField(primary_key=True, serialize=False)), - ('data_time', models.DateTimeField(auto_now_add=True)), - ('applicant', models.CharField(blank=True, max_length=255, null=True)), - ('comanda', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='comandas.comanda')), - ('product', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='products.product')), - ], - ), - ] diff --git a/gestaoRaul/balcao/migrations/0003_comanda_status_alter_productcomanda_product.py b/gestaoRaul/balcao/migrations/0003_comanda_status_alter_productcomanda_product.py deleted file mode 100644 index 6eb9bab..0000000 --- a/gestaoRaul/balcao/migrations/0003_comanda_status_alter_productcomanda_product.py +++ /dev/null @@ -1,25 +0,0 @@ -# Generated by Django 5.1.4 on 2024-12-20 12:36 - -import django.db.models.deletion -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('comandas', '0002_productcomanda'), - ('products', '0002_product_image_product_quantity'), - ] - - operations = [ - migrations.AddField( - model_name='comanda', - name='status', - field=models.CharField(default='OPEN', max_length=255), - ), - migrations.AlterField( - model_name='productcomanda', - name='product', - field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='products.product'), - ), - ] diff --git a/gestaoRaul/balcao/migrations/__pycache__/0001_initial.cpython-310.pyc b/gestaoRaul/balcao/migrations/__pycache__/0001_initial.cpython-310.pyc deleted file mode 100644 index 6e2bf15..0000000 Binary files a/gestaoRaul/balcao/migrations/__pycache__/0001_initial.cpython-310.pyc and /dev/null differ diff --git a/gestaoRaul/balcao/migrations/__pycache__/0001_initial.cpython-313.pyc b/gestaoRaul/balcao/migrations/__pycache__/0001_initial.cpython-313.pyc deleted file mode 100644 index 0d7b307..0000000 Binary files a/gestaoRaul/balcao/migrations/__pycache__/0001_initial.cpython-313.pyc and /dev/null differ diff --git a/gestaoRaul/balcao/migrations/__pycache__/0002_productcomanda.cpython-310.pyc b/gestaoRaul/balcao/migrations/__pycache__/0002_productcomanda.cpython-310.pyc deleted file mode 100644 index 0c99ec0..0000000 Binary files a/gestaoRaul/balcao/migrations/__pycache__/0002_productcomanda.cpython-310.pyc and /dev/null differ diff --git a/gestaoRaul/balcao/migrations/__pycache__/0002_productcomanda.cpython-313.pyc b/gestaoRaul/balcao/migrations/__pycache__/0002_productcomanda.cpython-313.pyc deleted file mode 100644 index 7d8887b..0000000 Binary files a/gestaoRaul/balcao/migrations/__pycache__/0002_productcomanda.cpython-313.pyc and /dev/null differ diff --git a/gestaoRaul/balcao/migrations/__pycache__/0003_comanda_status_alter_productcomanda_product.cpython-310.pyc b/gestaoRaul/balcao/migrations/__pycache__/0003_comanda_status_alter_productcomanda_product.cpython-310.pyc deleted file mode 100644 index c44a31a..0000000 Binary files a/gestaoRaul/balcao/migrations/__pycache__/0003_comanda_status_alter_productcomanda_product.cpython-310.pyc and /dev/null differ diff --git a/gestaoRaul/balcao/migrations/__pycache__/0003_comanda_status_alter_productcomanda_product.cpython-313.pyc b/gestaoRaul/balcao/migrations/__pycache__/0003_comanda_status_alter_productcomanda_product.cpython-313.pyc deleted file mode 100644 index 0ff469b..0000000 Binary files a/gestaoRaul/balcao/migrations/__pycache__/0003_comanda_status_alter_productcomanda_product.cpython-313.pyc and /dev/null differ diff --git a/gestaoRaul/balcao/migrations/__pycache__/__init__.cpython-310.pyc b/gestaoRaul/balcao/migrations/__pycache__/__init__.cpython-310.pyc deleted file mode 100644 index 74ce7ad..0000000 Binary files a/gestaoRaul/balcao/migrations/__pycache__/__init__.cpython-310.pyc and /dev/null differ diff --git a/gestaoRaul/balcao/migrations/__pycache__/__init__.cpython-313.pyc b/gestaoRaul/balcao/migrations/__pycache__/__init__.cpython-313.pyc deleted file mode 100644 index 1ebfce5..0000000 Binary files a/gestaoRaul/balcao/migrations/__pycache__/__init__.cpython-313.pyc and /dev/null differ diff --git a/gestaoRaul/categories/__pycache__/admin.cpython-313.pyc b/gestaoRaul/categories/__pycache__/admin.cpython-313.pyc index 7567127..7f3f2c5 100644 Binary files a/gestaoRaul/categories/__pycache__/admin.cpython-313.pyc and b/gestaoRaul/categories/__pycache__/admin.cpython-313.pyc differ diff --git a/gestaoRaul/categories/admin.py b/gestaoRaul/categories/admin.py index 8c38f3f..6c8026a 100644 --- a/gestaoRaul/categories/admin.py +++ b/gestaoRaul/categories/admin.py @@ -1,3 +1,6 @@ from django.contrib import admin -# Register your models here. +from categories.models import Categories + + +admin.site.register(Categories) diff --git a/gestaoRaul/clients/__pycache__/admin.cpython-313.pyc b/gestaoRaul/clients/__pycache__/admin.cpython-313.pyc index 31fc0c6..845caf1 100644 Binary files a/gestaoRaul/clients/__pycache__/admin.cpython-313.pyc and b/gestaoRaul/clients/__pycache__/admin.cpython-313.pyc differ diff --git a/gestaoRaul/clients/admin.py b/gestaoRaul/clients/admin.py index 8c38f3f..a412ced 100644 --- a/gestaoRaul/clients/admin.py +++ b/gestaoRaul/clients/admin.py @@ -1,3 +1,6 @@ from django.contrib import admin -# Register your models here. +from clients.models import Client + + +admin.site.register(Client) diff --git a/gestaoRaul/comandas/__pycache__/admin.cpython-313.pyc b/gestaoRaul/comandas/__pycache__/admin.cpython-313.pyc index ef38c48..303cf1d 100644 Binary files a/gestaoRaul/comandas/__pycache__/admin.cpython-313.pyc and b/gestaoRaul/comandas/__pycache__/admin.cpython-313.pyc differ diff --git a/gestaoRaul/comandas/admin.py b/gestaoRaul/comandas/admin.py index 8c38f3f..c0dd1c6 100644 --- a/gestaoRaul/comandas/admin.py +++ b/gestaoRaul/comandas/admin.py @@ -1,3 +1,7 @@ from django.contrib import admin -# Register your models here. +from comandas.models import Comanda, ProductComanda + +admin.site.register(Comanda) +admin.site.register(ProductComanda) + diff --git a/gestaoRaul/db.sqlite3 b/gestaoRaul/db.sqlite3 index 62e65ab..01dda61 100644 Binary files a/gestaoRaul/db.sqlite3 and b/gestaoRaul/db.sqlite3 differ diff --git a/gestaoRaul/gestaoRaul/__pycache__/settings.cpython-313.pyc b/gestaoRaul/gestaoRaul/__pycache__/settings.cpython-313.pyc index d302870..d23c5c2 100644 Binary files a/gestaoRaul/gestaoRaul/__pycache__/settings.cpython-313.pyc and b/gestaoRaul/gestaoRaul/__pycache__/settings.cpython-313.pyc differ diff --git a/gestaoRaul/gestaoRaul/settings.py b/gestaoRaul/gestaoRaul/settings.py index d01c9b5..914c889 100644 --- a/gestaoRaul/gestaoRaul/settings.py +++ b/gestaoRaul/gestaoRaul/settings.py @@ -53,6 +53,7 @@ INSTALLED_APPS = [ 'home', 'payments', 'balcao', + 'orders', ] MIDDLEWARE = [ diff --git a/gestaoRaul/mesas/__pycache__/admin.cpython-313.pyc b/gestaoRaul/mesas/__pycache__/admin.cpython-313.pyc index da39b22..17eefa2 100644 Binary files a/gestaoRaul/mesas/__pycache__/admin.cpython-313.pyc and b/gestaoRaul/mesas/__pycache__/admin.cpython-313.pyc differ diff --git a/gestaoRaul/mesas/admin.py b/gestaoRaul/mesas/admin.py index a3c618c..4ffb7a5 100644 --- a/gestaoRaul/mesas/admin.py +++ b/gestaoRaul/mesas/admin.py @@ -1,19 +1,7 @@ from django.contrib import admin -from categories.models import Categories -from clients.models import Client -from comandas.models import Comanda, ProductComanda -from typePay.models import TypePay -from products.models import Product from mesas.models import Mesa admin.site.register(Mesa) -admin.site.register(Product) -admin.site.register(Categories) -admin.site.register(Client) -admin.site.register(Comanda) -admin.site.register(TypePay) -admin.site.register(ProductComanda) -# Register your models here. diff --git a/gestaoRaul/balcao/migrations/__init__.py b/gestaoRaul/orders/__init__.py similarity index 100% rename from gestaoRaul/balcao/migrations/__init__.py rename to gestaoRaul/orders/__init__.py diff --git a/gestaoRaul/orders/__pycache__/__init__.cpython-313.pyc b/gestaoRaul/orders/__pycache__/__init__.cpython-313.pyc new file mode 100644 index 0000000..1f283de Binary files /dev/null and b/gestaoRaul/orders/__pycache__/__init__.cpython-313.pyc differ diff --git a/gestaoRaul/orders/__pycache__/admin.cpython-313.pyc b/gestaoRaul/orders/__pycache__/admin.cpython-313.pyc new file mode 100644 index 0000000..a3e6c47 Binary files /dev/null and b/gestaoRaul/orders/__pycache__/admin.cpython-313.pyc differ diff --git a/gestaoRaul/orders/__pycache__/apps.cpython-313.pyc b/gestaoRaul/orders/__pycache__/apps.cpython-313.pyc new file mode 100644 index 0000000..6ce116e Binary files /dev/null and b/gestaoRaul/orders/__pycache__/apps.cpython-313.pyc differ diff --git a/gestaoRaul/orders/__pycache__/models.cpython-313.pyc b/gestaoRaul/orders/__pycache__/models.cpython-313.pyc new file mode 100644 index 0000000..9729ab1 Binary files /dev/null and b/gestaoRaul/orders/__pycache__/models.cpython-313.pyc differ diff --git a/gestaoRaul/orders/admin.py b/gestaoRaul/orders/admin.py new file mode 100644 index 0000000..a028fdf --- /dev/null +++ b/gestaoRaul/orders/admin.py @@ -0,0 +1,6 @@ +from django.contrib import admin + +from orders.models import Order + + +admin.site.register(Order) diff --git a/gestaoRaul/orders/apps.py b/gestaoRaul/orders/apps.py new file mode 100644 index 0000000..8ae0375 --- /dev/null +++ b/gestaoRaul/orders/apps.py @@ -0,0 +1,6 @@ +from django.apps import AppConfig + + +class OrdersConfig(AppConfig): + default_auto_field = 'django.db.models.BigAutoField' + name = 'orders' diff --git a/gestaoRaul/orders/migrations/0001_initial.py b/gestaoRaul/orders/migrations/0001_initial.py new file mode 100644 index 0000000..bbd3bc7 --- /dev/null +++ b/gestaoRaul/orders/migrations/0001_initial.py @@ -0,0 +1,31 @@ +# Generated by Django 5.1.4 on 2025-01-10 16:28 + +import django.db.models.deletion +from django.db import migrations, models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('comandas', '0003_comanda_status_alter_productcomanda_product'), + ('products', '0003_product_cuisine'), + ] + + operations = [ + migrations.CreateModel( + name='Order', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('obs', models.TextField(blank=True, null=True)), + ('queue', models.DateTimeField(auto_now_add=True)), + ('preparing', models.DateTimeField(blank=True, null=True)), + ('finished', models.DateTimeField(blank=True, null=True)), + ('delivered', models.DateTimeField(blank=True, null=True)), + ('canceled', models.DateTimeField(blank=True, null=True)), + ('id_comanda', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='comandas.comanda')), + ('id_product', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='products.product')), + ], + ), + ] diff --git a/gestaoRaul/orders/migrations/__init__.py b/gestaoRaul/orders/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/gestaoRaul/orders/migrations/__pycache__/0001_initial.cpython-313.pyc b/gestaoRaul/orders/migrations/__pycache__/0001_initial.cpython-313.pyc new file mode 100644 index 0000000..d59e0ed Binary files /dev/null and b/gestaoRaul/orders/migrations/__pycache__/0001_initial.cpython-313.pyc differ diff --git a/gestaoRaul/orders/migrations/__pycache__/__init__.cpython-313.pyc b/gestaoRaul/orders/migrations/__pycache__/__init__.cpython-313.pyc new file mode 100644 index 0000000..7021686 Binary files /dev/null and b/gestaoRaul/orders/migrations/__pycache__/__init__.cpython-313.pyc differ diff --git a/gestaoRaul/orders/models.py b/gestaoRaul/orders/models.py new file mode 100644 index 0000000..daf26e1 --- /dev/null +++ b/gestaoRaul/orders/models.py @@ -0,0 +1,18 @@ +from django.db import models + +from products.models import Product +from comandas.models import Comanda + + +class Order(models.Model): + id_product = models.ForeignKey(Product, on_delete=models.CASCADE) + id_comanda = models.ForeignKey(Comanda, on_delete=models.CASCADE) + obs = models.TextField(blank=True, null=True) + queue = models.DateTimeField(auto_now_add=True) + preparing = models.DateTimeField(null=True, blank=True) + finished = models.DateTimeField(null=True, blank=True) + delivered = models.DateTimeField(null=True, blank=True) + canceled = models.DateTimeField(null=True, blank=True) + + def __str__(self): + return f"Pedido {self.id} - Produto: {self.id_product} - Comanda: {self.id_comanda.name}" \ No newline at end of file diff --git a/gestaoRaul/orders/tests.py b/gestaoRaul/orders/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/gestaoRaul/orders/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/gestaoRaul/orders/views.py b/gestaoRaul/orders/views.py new file mode 100644 index 0000000..91ea44a --- /dev/null +++ b/gestaoRaul/orders/views.py @@ -0,0 +1,3 @@ +from django.shortcuts import render + +# Create your views here. diff --git a/gestaoRaul/payments/__pycache__/admin.cpython-313.pyc b/gestaoRaul/payments/__pycache__/admin.cpython-313.pyc index 14089d9..94e9be4 100644 Binary files a/gestaoRaul/payments/__pycache__/admin.cpython-313.pyc and b/gestaoRaul/payments/__pycache__/admin.cpython-313.pyc differ diff --git a/gestaoRaul/payments/__pycache__/models.cpython-313.pyc b/gestaoRaul/payments/__pycache__/models.cpython-313.pyc index fe8c717..041edbc 100644 Binary files a/gestaoRaul/payments/__pycache__/models.cpython-313.pyc and b/gestaoRaul/payments/__pycache__/models.cpython-313.pyc differ diff --git a/gestaoRaul/payments/admin.py b/gestaoRaul/payments/admin.py index 8c38f3f..f2a7f9d 100644 --- a/gestaoRaul/payments/admin.py +++ b/gestaoRaul/payments/admin.py @@ -1,3 +1,6 @@ from django.contrib import admin -# Register your models here. +from payments.models import Payments + +admin.site.register(Payments) + diff --git a/gestaoRaul/payments/models.py b/gestaoRaul/payments/models.py index 8eae50e..c5b4d0d 100644 --- a/gestaoRaul/payments/models.py +++ b/gestaoRaul/payments/models.py @@ -15,4 +15,4 @@ class Payments(models.Model): def __str__(self): - return self.value \ No newline at end of file + return self.comanda.name \ No newline at end of file diff --git a/gestaoRaul/products/__pycache__/admin.cpython-313.pyc b/gestaoRaul/products/__pycache__/admin.cpython-313.pyc index a6312be..014a5d8 100644 Binary files a/gestaoRaul/products/__pycache__/admin.cpython-313.pyc and b/gestaoRaul/products/__pycache__/admin.cpython-313.pyc differ diff --git a/gestaoRaul/products/__pycache__/models.cpython-313.pyc b/gestaoRaul/products/__pycache__/models.cpython-313.pyc index b466f73..e4c6a13 100644 Binary files a/gestaoRaul/products/__pycache__/models.cpython-313.pyc and b/gestaoRaul/products/__pycache__/models.cpython-313.pyc differ diff --git a/gestaoRaul/products/admin.py b/gestaoRaul/products/admin.py index 8c38f3f..2899e43 100644 --- a/gestaoRaul/products/admin.py +++ b/gestaoRaul/products/admin.py @@ -1,3 +1,6 @@ from django.contrib import admin -# Register your models here. +from products.models import Product + + +admin.site.register(Product) diff --git a/gestaoRaul/products/migrations/0003_product_cuisine.py b/gestaoRaul/products/migrations/0003_product_cuisine.py new file mode 100644 index 0000000..72d269d --- /dev/null +++ b/gestaoRaul/products/migrations/0003_product_cuisine.py @@ -0,0 +1,18 @@ +# Generated by Django 5.1.4 on 2025-01-10 16:24 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('products', '0002_product_image_product_quantity'), + ] + + operations = [ + migrations.AddField( + model_name='product', + name='cuisine', + field=models.BooleanField(default=False), + ), + ] diff --git a/gestaoRaul/products/migrations/__pycache__/0003_product_cuisine.cpython-313.pyc b/gestaoRaul/products/migrations/__pycache__/0003_product_cuisine.cpython-313.pyc new file mode 100644 index 0000000..b6a3119 Binary files /dev/null and b/gestaoRaul/products/migrations/__pycache__/0003_product_cuisine.cpython-313.pyc differ diff --git a/gestaoRaul/products/models.py b/gestaoRaul/products/models.py index 189ab2a..aee417e 100644 --- a/gestaoRaul/products/models.py +++ b/gestaoRaul/products/models.py @@ -11,6 +11,7 @@ class Product(models.Model): price = models.DecimalField(max_digits=10, decimal_places=2) quantity = models.IntegerField(null=False, default=0) category = models.ForeignKey(Categories, on_delete=models.CASCADE) + cuisine = models.BooleanField(default=False) active = models.BooleanField(default=True) def __str__(self) -> str: diff --git a/gestaoRaul/templates/htmx_components/products/htmx_search_products.html b/gestaoRaul/templates/htmx_components/products/htmx_search_products.html index 97d33fa..1f2d76c 100644 --- a/gestaoRaul/templates/htmx_components/products/htmx_search_products.html +++ b/gestaoRaul/templates/htmx_components/products/htmx_search_products.html @@ -4,8 +4,8 @@ Produto Preço - Quantidade - Categoria + Quantidade + Categoria Ações @@ -14,8 +14,8 @@ {{product.name}} R$ {{product.price}} -{{product.quantity}} -{{product.category.name}} +{{product.quantity}} +{{product.category.name}}