fixed errors

mitumbaesales/.gitignore

@@ -0,0 +1,19 @@
+mitumbavenv/
+__pycache__/
+*.pyc
+db.sqlite3
+.env
+.venv/
+
+
+mitumbaesales/authentication/*
+mitumbaesales/notification/*
+mitumbaesales/offer/*
+mitumbaesales/order/*
+mitumbaesales/payments/*
+mitumbaesales/product/*
+mitumbaesales/reviews/*
+mitumbaesales/cart/*
+
+staticfiles/
+*.log

mitumbaesales/api/migrations/0001_initial.py

@@ -0,0 +1,21 @@
+# Generated by Django 5.2.3 on 2025-07-18 14:20
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='MyModel',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=100)),
+            ],
+        ),
+    ]

mitumbaesales/api/urls.py

@@ -23,7 +23,6 @@
 router.register(r'users', UserViewSet, basename='user')
 router.register(r'orders', OrderViewSet, basename='orders')
 router.register(r'orderitems', OrderItemViewSet, basename='orderitems')
-router.register(r'payments', OrderViewSet, basename='payments')
 router.register(r'offers', OfferViewSet, basename='offers')
 router.register(r'discounts', DiscountViewSet, basename='discounts')
 router.register(r'reviews', ReviewViewSet, basename='reviews')

mitumbaesales/authentication/migrations/0001_initial.py

@@ -0,0 +1,31 @@
+# Generated by Django 5.2.3 on 2025-06-26 06:33
+
+import uuid
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='User',
+            fields=[
+                ('user', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)),
+                ('name', models.CharField(max_length=100)),
+                ('email', models.EmailField(blank=True, max_length=100, null=True, unique=True)),
+                ('phone', models.CharField(blank=True, max_length=15, null=True, unique=True)),
+                ('password', models.CharField(max_length=100)),
+                ('user_type', models.CharField(choices=[('Buyer', 'Buyer'), ('Seller', 'Seller')], max_length=10)),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('updated_at', models.DateTimeField(auto_now=True)),
+            ],
+            options={
+                'constraints': [models.CheckConstraint(condition=models.Q(('email__isnull', False), ('phone__isnull', False), _connector='OR'), name='email_or_phone_check')],
+            },
+        ),
+    ]

mitumbaesales/cart/migrations/0001_initial.py

@@ -0,0 +1,40 @@
+# Generated by Django 5.2.3 on 2025-06-26 09:08
+
+import django.db.models.deletion
+import uuid
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('product', '0001_initial'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Cart',
+            fields=[
+                ('cart_id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('updated_at', models.DateTimeField(auto_now=True)),
+                ('buyer', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='CartItem',
+            fields=[
+                ('cart_item_id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)),
+                ('quantity', models.PositiveIntegerField(default=1)),
+                ('unit_price', models.DecimalField(decimal_places=2, max_digits=10)),
+                ('subtotal', models.DecimalField(decimal_places=2, editable=False, max_digits=10)),
+                ('added_at', models.DateTimeField(auto_now_add=True)),
+                ('cart', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cart.cart')),
+                ('product', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='product.product')),
+            ],
+        ),
+    ]

mitumbaesales/mitumbaesales/settings.py

@@ -11,6 +11,7 @@
 """
 
 from pathlib import Path
+import os
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent
@@ -123,9 +124,18 @@
 
 
 # Static files (CSS, JavaScript, Images)
+
 # https://docs.djangoproject.com/en/5.2/howto/static-files/
 
+STATIC_ROOT =os.path.join(BASE_DIR, 'staticfiles')
 STATIC_URL = 'static/'
+STATICFILES_DIRS = (
+    os.path.join(BASE_DIR, 'static'),
+)
+
+
+
+
 
 # Default primary key field type
 # https://docs.djangoproject.com/en/5.2/ref/settings/#default-auto-field

mitumbaesales/mitumbaesales/urls.py

@@ -17,10 +17,13 @@
 from django.contrib import admin
 from django.urls import path, include
 from django.http import HttpResponse
+from django.conf import settings
+from django.conf.urls.static import static
 
 urlpatterns = [
     path('admin/', admin.site.urls),
     path('api/', include('api.urls')),
+
 
 ]
 

mitumbaesales/notification/migrations/0001_initial.py

@@ -0,0 +1,29 @@
+# Generated by Django 5.2.3 on 2025-06-26 09:08
+
+import django.db.models.deletion
+import uuid
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Notification',
+            fields=[
+                ('notification_id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)),
+                ('message', models.TextField()),
+                ('notifications_type', models.CharField(choices=[('Order update', 'Order update'), ('Payment Confirmation', 'Payment Confirmation'), ('General Alert', 'General Alert')], max_length=20)),
+                ('is_read', models.BooleanField(default=False)),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+    ]

mitumbaesales/offer/migrations/0001_initial.py

@@ -0,0 +1,83 @@
+# Generated by Django 5.2.3 on 2025-06-26 09:08
+
+import django.db.models.deletion
+import uuid
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('product', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Discount',
+            fields=[
+                ('discount_id', models.CharField(max_length=50, primary_key=True, serialize=False)),
+                ('name', models.CharField(max_length=255)),
+                ('discount_type', models.CharField(choices=[('percentage', 'Percentage'), ('fixed_amount', 'Fixed Amount')], max_length=50)),
+                ('value', models.DecimalField(decimal_places=2, max_digits=10)),
+                ('min_purchase_amount', models.DecimalField(decimal_places=2, default=0.0, max_digits=10)),
+                ('max_purchase_amount', models.DecimalField(blank=True, decimal_places=2, max_digits=10, null=True)),
+                ('is_active', models.BooleanField(default=True)),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('updated_at', models.DateTimeField(auto_now=True)),
+            ],
+            options={
+                'verbose_name_plural': 'Discounts',
+                'ordering': ['-created_at'],
+            },
+        ),
+        migrations.CreateModel(
+            name='Offer',
+            fields=[
+                ('offer_id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)),
+                ('name', models.CharField(max_length=255)),
+                ('description', models.TextField(blank=True, null=True)),
+                ('offer_type', models.CharField(max_length=50)),
+                ('start_date', models.DateField()),
+                ('end_date', models.DateField()),
+                ('is_active', models.BooleanField(default=True)),
+                ('priority', models.IntegerField(default=0)),
+                ('usage_limit', models.IntegerField(default=0)),
+                ('uses_count', models.IntegerField(default=0)),
+                ('applies_to', models.CharField(max_length=100)),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('updated_at', models.DateTimeField(auto_now=True)),
+            ],
+            options={
+                'verbose_name_plural': 'Offers',
+                'ordering': ['-created_at'],
+            },
+        ),
+        migrations.CreateModel(
+            name='OfferDiscount',
+            fields=[
+                ('offer_discount_id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)),
+                ('discount', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='offer_discounts', to='offer.discount')),
+                ('offer', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='offer_discounts', to='offer.offer')),
+            ],
+            options={
+                'verbose_name_plural': 'Offer Discounts',
+                'ordering': ['offer'],
+                'unique_together': {('offer', 'discount')},
+            },
+        ),
+        migrations.CreateModel(
+            name='OfferProduct',
+            fields=[
+                ('offer_product_id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)),
+                ('offer', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='offer_products', to='offer.offer')),
+                ('product', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='offer_products', to='product.product')),
+            ],
+            options={
+                'verbose_name_plural': 'Offer Products',
+                'ordering': ['offer'],
+                'unique_together': {('offer', 'product')},
+            },
+        ),
+    ]

mitumbaesales/orders/migrations/0004_alter_order_status.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2.3 on 2025-07-11 14:49
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('orders', '0003_remove_order_order_id_remove_orderitem_order_item_id_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='order',
+            name='status',
+            field=models.CharField(choices=[('pending', 'Pending'), ('processed', 'Processed'), ('cancelled', 'Cancelled')], default='Pending', max_length=20),
+        ),
+    ]

mitumbaesales/orders/migrations/0005_merge_20250718_1401.py

@@ -0,0 +1,15 @@
+# Generated by Django 5.2.3 on 2025-07-18 14:01
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('orders', '0004_alter_order_buyer_alter_order_status'),
+        ('orders', '0004_alter_order_status'),
+    ]
+
+    operations = [
+
+    ]

mitumbaesales/payments/migrations/0001_initial.py

@@ -0,0 +1,51 @@
+# Generated by Django 5.2.3 on 2025-06-26 09:08
+
+import django.db.models.deletion
+import uuid
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('authentication', '0001_initial'),
+        ('orders', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Payment',
+            fields=[
+                ('payment_id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False)),
+                ('amount', models.DecimalField(decimal_places=2, max_digits=10)),
+                ('payment_method', models.CharField(choices=[('M-Pesa', 'M-Pesa')], default='M-Pesa', max_length=30)),
+                ('payment_status', models.CharField(choices=[('Pending', 'Pending'), ('Completed', 'Completed'), ('Failed', 'Failed')], default='Pending', max_length=30)),
+                ('phone_number', models.CharField(blank=True, max_length=20, null=True)),
+                ('mpesa_receipt_number', models.CharField(blank=True, max_length=100, null=True)),
+                ('paid_at', models.DateTimeField(blank=True, null=True)),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('updated_at', models.DateTimeField(auto_now=True)),
+                ('buyer', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='authentication.user')),
+                ('order', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='orders.order')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='PaymentTransfer',
+            fields=[
+                ('transfer_id', models.UUIDField(default=uuid.uuid4, primary_key=True, serialize=False)),
+                ('amount', models.DecimalField(decimal_places=2, max_digits=10)),
+                ('platform_fee', models.DecimalField(decimal_places=2, default=0.0, max_digits=10)),
+                ('transfer_method', models.CharField(default='M-Pesa', max_length=30)),
+                ('transfer_status', models.CharField(choices=[('Pending', 'Pending'), ('Completed', 'Completed'), ('Failed', 'Failed')], default='Pending', max_length=30)),
+                ('transferred_at', models.DateTimeField(blank=True, null=True)),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('updated_at', models.DateTimeField(auto_now=True)),
+                ('buyer', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='buyer_transfers', to='authentication.user')),
+                ('order', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='orders.order')),
+                ('payment', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='payments.payment')),
+                ('seller', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='seller_transfers', to='authentication.user')),
+            ],
+        ),
+    ]

mitumbaesales/payments/models.py

@@ -2,9 +2,9 @@
 import uuid
 from authentication.models import User
 from orders.models import Order
-import requests
+# import requests
 from django.conf import settings
-from requests.auth import HTTPBasicAuth
+# from requests.auth import HTTPBasicAuth
 import base64
 import datetime