MNPC/RasadDam_Backend
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

role type key

Browse Source
This commit is contained in:
Mojtaba-z
2025-11-10 11:31:27 +03:30
parent be29ab8cfa
commit 132fe7a5bc
5 changed files with 37 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.env.local
View File

@@ -7,7 +7,7 @@ ENV_NAME=DEV
# Database secrets # Database secrets
DB_HOST=31.7.78.133 DB_HOST=31.7.78.133
DB_PORT=14352 DB_PORT=14352
DB_NAME=Development DB_NAME=Production
DB_USERNAME=postgres DB_USERNAME=postgres
DB_PASSWORD=pfLIVXupbDetvFMt2gUvxLXUL9b4HIOHaPcKXsBEZ1i8zl0iLUjmhUfXlGfJKcTV DB_PASSWORD=pfLIVXupbDetvFMt2gUvxLXUL9b4HIOHaPcKXsBEZ1i8zl0iLUjmhUfXlGfJKcTV

6
apps/authorization/api/v1/serializers.py
View File

@@ -147,7 +147,11 @@ class UserRelationSerializer(serializers.ModelSerializer):
if instance.organization: if instance.organization:
representation['organization'] = {"id": instance.organization.id, "name": instance.organization.name} representation['organization'] = {"id": instance.organization.id, "name": instance.organization.name}
if instance.role: if instance.role:
representation['role'] = {"id": instance.role.id, "role_name": instance.role.role_name} representation['role'] = {
"id": instance.role.id, "role_name": instance.role.role_name, 'type': {
'key': instance.role.type.key
}
}
if instance.permissions: # noqa if instance.permissions: # noqa
# set permissions by a default structure like: # set permissions by a default structure like:
# 'page permission':[element permissions] # 'page permission':[element permissions]

18
apps/product/migrations/0085_broker_suggested_broker_price.py Normal file
View File

@@ -0,0 +1,18 @@
# Generated by Django 5.0 on 2025-11-10 07:41
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('product', '0084_broker_fix_broker_price_state'),
]
operations = [
migrations.AddField(
model_name='broker',
name='suggested_broker_price',
field=models.PositiveBigIntegerField(default=0),
),
]

22
apps/product/pos/api/v1/viewsets/product_api.py
View File

@@ -1,16 +1,17 @@
from apps.product.pos.api.v1.serializers import product_serializers as product_serializers from django.db import transaction
from apps.pos_device.mixins.pos_device_mixin import POSDeviceMixin from rest_framework import status
from apps.core.mixins.search_mixin import DynamicSearchMixin from rest_framework import viewsets
from apps.core.mixins.soft_delete_mixin import SoftDeleteMixin from rest_framework.decorators import action
from rest_framework.exceptions import APIException from rest_framework.exceptions import APIException
from apps.product import models as product_models
from apps.pos_device import models as pos_models
from rest_framework.permissions import AllowAny from rest_framework.permissions import AllowAny
from rest_framework.response import Response from rest_framework.response import Response
from rest_framework.decorators import action
from rest_framework import viewsets from apps.core.mixins.search_mixin import DynamicSearchMixin
from rest_framework import status from apps.core.mixins.soft_delete_mixin import SoftDeleteMixin
from django.db import transaction from apps.pos_device import models as pos_models
from apps.pos_device.mixins.pos_device_mixin import POSDeviceMixin
from apps.product import models as product_models
from apps.product.pos.api.v1.serializers import product_serializers as product_serializers
def trash(queryset, pk): # noqa def trash(queryset, pk): # noqa
@@ -105,6 +106,7 @@ class POSFreeProductsViewSet(SoftDeleteMixin, viewsets.ModelViewSet, DynamicSear
request.data.update({ request.data.update({
'organization': organization.id, 'organization': organization.id,
'device': device.id, 'device': device.id,
'company_fee': product_models.Broker.objects.get(organization=organization).company_fee,
}) })
serializer = product_serializers.POSFreeProductSerializer(data=request.data, context={'device': device}) serializer = product_serializers.POSFreeProductSerializer(data=request.data, context={'device': device})

2
entrypoint.sh
View File

@@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
echo "🚀 Make migrations..." echo "🚀 Make migrations..."
python manage.py migrate --noinput python manage.py makemigrations --noinput
echo "🚀 Applying database migrations..." echo "🚀 Applying database migrations..."
python manage.py migrate --noinput python manage.py migrate --noinput