diff --git a/api/__pycache__/settings.cpython-313.pyc b/api/__pycache__/settings.cpython-313.pyc index 6f12e0ef..41931f45 100644 Binary files a/api/__pycache__/settings.cpython-313.pyc and b/api/__pycache__/settings.cpython-313.pyc differ diff --git a/app/__pycache__/models.cpython-313.pyc b/app/__pycache__/models.cpython-313.pyc index d4e08c10..4f1451c9 100644 Binary files a/app/__pycache__/models.cpython-313.pyc and b/app/__pycache__/models.cpython-313.pyc differ diff --git a/app/__pycache__/workflow_utils.cpython-313.pyc b/app/__pycache__/workflow_utils.cpython-313.pyc index 2c2998d4..55df2ea2 100644 Binary files a/app/__pycache__/workflow_utils.cpython-313.pyc and b/app/__pycache__/workflow_utils.cpython-313.pyc differ diff --git a/app/migrations/0367_dealer_batch_date_dealer_commission_amount_and_more.py b/app/migrations/0367_dealer_batch_date_dealer_commission_amount_and_more.py new file mode 100644 index 00000000..6b3f949c --- /dev/null +++ b/app/migrations/0367_dealer_batch_date_dealer_commission_amount_and_more.py @@ -0,0 +1,49 @@ +# Generated by Django 5.1.7 on 2026-01-26 08:24 + +import django.db.models.deletion +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('app', '0366_payment_schedule_batch_date'), + ] + + operations = [ + migrations.AddField( + model_name='dealer', + name='batch_date', + field=models.DateTimeField(null=True), + ), + migrations.AddField( + model_name='dealer', + name='commission_amount', + field=models.DecimalField(decimal_places=2, max_digits=15, null=True), + ), + migrations.AddField( + model_name='dealer', + name='commission_remain', + field=models.DecimalField(decimal_places=2, max_digits=15, null=True), + ), + migrations.AddField( + model_name='dealer', + name='pay_commission', + field=models.DecimalField(decimal_places=2, max_digits=15, null=True), + ), + migrations.AddField( + model_name='dealer', + name='pay_sale', + field=models.DecimalField(decimal_places=2, max_digits=15, null=True), + ), + migrations.AddField( + model_name='dealer', + name='sale_amount', + field=models.DecimalField(decimal_places=2, max_digits=15, null=True), + ), + migrations.AlterField( + model_name='product_booked', + name='transaction', + field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='transbk', to='app.transaction'), + ), + ] diff --git a/app/migrations/0368_dealer_count_sale.py b/app/migrations/0368_dealer_count_sale.py new file mode 100644 index 00000000..4ab12cdb --- /dev/null +++ b/app/migrations/0368_dealer_count_sale.py @@ -0,0 +1,18 @@ +# Generated by Django 5.1.7 on 2026-01-26 09:47 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('app', '0367_dealer_batch_date_dealer_commission_amount_and_more'), + ] + + operations = [ + migrations.AddField( + model_name='dealer', + name='count_sale', + field=models.IntegerField(null=True), + ), + ] diff --git a/app/models.py b/app/models.py index 6a11d0cc..297bebc6 100644 --- a/app/models.py +++ b/app/models.py @@ -784,6 +784,13 @@ class Dealer(AutoCodeModel): phone = models.CharField(max_length=20, null=True, db_index=True) email = models.CharField(max_length=50, null=True) address = models.CharField(max_length=255, null=True) + sale_amount = models.DecimalField(max_digits=15, decimal_places=2,null=True) + pay_sale = models.DecimalField(max_digits=15, decimal_places=2,null=True) + commission_amount = models.DecimalField(max_digits=15, decimal_places=2,null=True) + pay_commission = models.DecimalField(max_digits=15, decimal_places=2,null=True) + commission_remain = models.DecimalField(max_digits=15, decimal_places=2,null=True) + batch_date = models.DateTimeField(null=True) + count_sale = models.IntegerField(null=True) create_time = models.DateTimeField(null=True, auto_now_add=True) update_time = models.DateTimeField(null=True, auto_now=True) @@ -1460,7 +1467,7 @@ class Transaction_File(models.Model): class Product_Booked(models.Model): product = models.OneToOneField(Product, null=False, related_name='prdbk', on_delete=models.PROTECT) - transaction = models.ForeignKey(Transaction, null=False, related_name='+', on_delete=models.PROTECT) + transaction = models.ForeignKey(Transaction, null=False, related_name='transbk', on_delete=models.PROTECT) create_time = models.DateTimeField(null=True, auto_now_add=True) update_time = models.DateTimeField(null=True, auto_now=True)