From eaa80f7e79f9d9c957dce7f417349d52d8b4df99 Mon Sep 17 00:00:00 2001 From: Mojtaba-z Date: Wed, 3 Sep 2025 15:52:33 +0330 Subject: [PATCH] change inventory entries pos list pricing base price --- Rasaddam_Backend/settings.py | 6 +++--- apps/pos_device/services/services.py | 6 +++--- apps/warehouse/pos/api/v1/serializers.py | 14 ++++++++++++-- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/Rasaddam_Backend/settings.py b/Rasaddam_Backend/settings.py index a4a35e7..e94e353 100644 --- a/Rasaddam_Backend/settings.py +++ b/Rasaddam_Backend/settings.py @@ -96,9 +96,9 @@ INSTALLED_APPS = [ ] MIDDLEWARE = [ - "corsheaders.middleware.CorsMiddleware", - 'django.middleware.security.SecurityMiddleware', 'apps.core.middlewares.Json500Middleware', + 'corsheaders.middleware.CorsMiddleware', # noqa + 'django.middleware.security.SecurityMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', 'django.middleware.common.CommonMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', @@ -106,7 +106,7 @@ MIDDLEWARE = [ 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', 'apps.authentication.middlewares.BlockedTokenMiddleware', - 'crum.CurrentRequestUserMiddleware', + 'crum.CurrentRequestUserMiddleware', # noqa 'apps.log.middlewares.SaveLog', 'apps.pos_device.middlewares.PosDeviceValidationMiddleware' ] diff --git a/apps/pos_device/services/services.py b/apps/pos_device/services/services.py index 8d8ebd9..6830a51 100644 --- a/apps/pos_device/services/services.py +++ b/apps/pos_device/services/services.py @@ -11,9 +11,9 @@ def pos_organizations_sharing_information(device: Device) -> typing.Any: sharing_information_list = [{ "organization_name": item.organization.name, - "credit_card": item.organization.bank_information.first().card if item.organization.bank_information.exists() else "", - "sheba": item.organization.bank_information.first().sheba, - "account": item.organization.bank_information.first().account, + # "credit_card": item.organization.bank_information.first().card if item.organization.bank_information.exists() else "", + # "sheba": item.organization.bank_information.first().sheba, + # "account": item.organization.bank_information.first().account, "broker": item.broker.name if item.broker else None, "amount": item.broker_amount.value if item.broker else None } for item in stake_holders] diff --git a/apps/warehouse/pos/api/v1/serializers.py b/apps/warehouse/pos/api/v1/serializers.py index 098b0b1..8d84d49 100644 --- a/apps/warehouse/pos/api/v1/serializers.py +++ b/apps/warehouse/pos/api/v1/serializers.py @@ -63,8 +63,18 @@ class InventoryEntrySerializer(serializers.ModelSerializer): representation['pricing'] = { 'pricing_attributes': quota_attribute_value(instance.distribution.quota), 'sharing': pos_organizations_sharing_information(self.context['device']), - 'base_price_factory': instance.distribution.quota.base_price_factory, - 'base_price_cooperative': instance.distribution.quota.base_price_cooperative, + 'base_prices': [ + { + "text": "قیمت درب کارخانه", # noqa + "name": "base_price_factory", + "value": instance.distribution.quota.base_price_factory + }, + { + "text": "قیمت درب اتحادیه", # noqa + "name": "base_price_cooperative", + "value": instance.distribution.quota.base_price_cooperative + } + ] } if 'rancher' in self.context.keys():