Commit Graph

Select branches

Hide Pull Requests

development

main

Mono Color

• 9d9d4d3b80 rancher quota statistics including livestock allocations & incentive plan assignments Mojtaba-z 2025-08-30 16:09:37 +03:30
• 8015d9a954 add new fields to incentive assignment Mojtaba-z 2025-08-30 12:54:07 +03:30
• 83fe7d5bab add livestock weight types to allocation info for pos Mojtaba-z 2025-08-30 12:14:55 +03:30
• a1f8536a86 change livestock quota allocations quantity to int - change rancher statistics from decimal to int Mojtaba-z 2025-08-30 12:04:14 +03:30
• 91f69c171b fix pos inventory serializer context rancher key Mojtaba-z 2025-08-30 10:47:16 +03:30
• 5b0d6ac8ee check rancher unique national code in serilaizer validation Mojtaba-z 2025-08-30 10:40:02 +03:30
• 29025235d5 set to get rancher_inventory - change serializer to check context Mojtaba-z 2025-08-30 10:34:20 +03:30
• 390f1afe74 add acceptor & terminal device to assignment - add phone to organization - set password for device when assignment Mojtaba-z 2025-08-30 09:47:36 +03:30
• 00edbeb847 Fix typo in device activation condition in POSDeviceViewSet Mohammad Kiani 2025-08-28 03:50:50 +03:30
• 1cf548f487 Refactor login method in POSDeviceViewSet to improve device activation logic and response messages Mohammad Kiani 2025-08-28 03:45:09 +03:30
• 030d5f7932 Remove unused OrganizationSerializer import from device.py Mohammad Kiani 2025-08-27 22:06:37 +03:30
• 906983a2f0 Remove unused Organization and User serializers; update POSDeviceViewSet to directly construct organization data for response Mohammad Kiani 2025-08-27 22:02:14 +03:30
• ed8d14df94 Refactor import statements in device.py for improved readability Mohammad Kiani 2025-08-27 21:46:52 +03:30
• 5ae913828e Add Organization and User serializers to device viewset for enhanced user data retrieval Mohammad Kiani 2025-08-27 21:39:01 +03:30
• 499273486c Update device.py Mohammad Kiani 2025-08-27 20:56:16 +03:30
• 680a469839 add some new data to device login data, first part of broker to stake holders assignment Mojtaba-z 2025-08-27 17:04:55 +03:30
• 65c831d6a8 first setup of pos transaction - add provider, user, organization information of pos to login Mojtaba-z 2025-08-26 15:24:46 +03:30
• c0b6b8ddca add purchace limitations system for rancher - add incentive plans to rancher entries data Mojtaba-z 2025-08-26 12:18:10 +03:30
• b5dfcebafe fix login bug in if state of (and or) Mojtaba-z 2025-08-26 09:18:40 +03:30
• b109578ce2 set device assigned state in pos login Mojtaba-z 2025-08-25 17:00:56 +03:30
• 4146a66950 add some new fields to quota sale transaction model - add rancher information about live stocks & quota aalocations information Mojtaba-z 2025-08-25 16:34:48 +03:30
• 2725bc5077 add rancher statistics to inventory entries list - fix bug of login for empty string device identity Mojtaba-z 2025-08-25 14:43:56 +03:30
• 7722ddfc84 make default stake holder when creating assignment Mojtaba-z 2025-08-25 13:09:17 +03:30
• 64d19e9028 pos device transaction list Mojtaba-z 2025-08-25 10:20:25 +03:30
• 41dcf4f153 fix pos login bug (client not find) Mojtaba-z 2025-08-25 08:29:16 +03:30
• f271c908c9 some apis of pos Mojtaba-z 2025-08-20 16:12:49 +03:30
• 20e4bfad75 some apis of pos Mojtaba-z 2025-08-20 14:44:43 +03:30
• 14cd349a7d add new fields to rancher Mojtaba-z 2025-08-19 09:03:41 +03:30
• b64c28b6d1 pre registered device unauthorized condition Mojtaba-z 2025-08-18 10:24:37 +03:30
• e8b01b8e3a device login Mojtaba-z 2025-08-18 10:08:33 +03:30
• c2318b45c5 pos device login depoyment Mojtaba-z 2025-08-17 15:11:58 +03:30
• d2fa1b264f show bank accounts of stakeholders - vw Mojtaba-z 2025-08-17 10:07:48 +03:30
• 5b1c5e0cb0 show bank accounts of stakeholders Mojtaba-z 2025-08-17 09:57:14 +03:30
• a51a4442ce edit assignment Mojtaba-z 2025-08-16 16:45:58 +03:30
• 63be0fbf95 import assigned status to device Mojtaba-z 2025-08-16 15:55:00 +03:30
• 7df6d2abdd import exclude param in organizations list Mojtaba-z 2025-08-16 14:43:24 +03:30
• 74584e5c1c return validate attr in assignment serializer - import exclude param in organizations list Mojtaba-z 2025-08-16 14:40:14 +03:30
• 1d07501ecf device assignment bug-assignment information-bug of organizations list for assignment Mojtaba-z 2025-08-16 14:22:00 +03:30
• ebd3aee47f Merge branch 'main' of https://github.com/MNPC-IR/Rasaddam_Backend Mojtaba-z 2025-08-16 09:50:33 +03:30
• 24608931bc dont show my organization in organization by province Mojtaba-z 2025-08-16 09:50:19 +03:30
• bdd6acc7ca add excelstyler librery 7nimor 2025-08-16 08:52:00 +03:30
• ab2a453a54 add excelstyler librery 7nimor 2025-08-16 08:27:04 +03:30
• ed363f6092 add province id to device organizatiomn serializer Mojtaba-z 2025-08-12 12:54:06 +03:30
• 00e2c23409 validation for pos device - some changes in pos device models Mojtaba-z 2025-08-12 12:22:05 +03:30
• 787de09f12 devices by psp organizations Mojtaba-z 2025-08-11 15:31:22 +03:30
• 87c8b25ba4 devices by psp organizations - fix pages pagination Mojtaba-z 2025-08-11 14:43:34 +03:30
• cae27e9ed7 list of devices by admin filter mixin ordering Mojtaba-z 2025-08-11 12:23:39 +03:30
• cd94c42a2a list of devices by admin filter mixin Mojtaba-z 2025-08-11 12:20:58 +03:30
• e78d983813 list of devices by admin filter mixin Mojtaba-z 2025-08-11 12:16:02 +03:30
• 588e97ae2d stakeholders create & list of psp organizations Mojtaba-z 2025-08-11 11:35:43 +03:30
• f9be8cf58d change structure of provider companies to organizations Mojtaba-z 2025-08-10 12:35:52 +03:30
• a28a1307cc change structure of provider companies to organizations Mojtaba-z 2025-08-10 12:30:48 +03:30
• 91d9025751 fix bug of inventory entry Mojtaba-z 2025-08-10 09:16:48 +03:30
• ac1cd16de8 fix bug of inventory entry Mojtaba-z 2025-08-10 08:38:27 +03:30
• a8eda71e0f fix product stat distribution remaining Mojtaba-z 2025-08-09 17:02:45 +03:30
• efa0ab3950 fix distributoion creation bug Mojtaba-z 2025-08-09 16:51:31 +03:30
• fbade19655 fix product stat quota remaining Mojtaba-z 2025-08-09 16:45:34 +03:30
• 8e3c5e131c fix create distribution bug Mojtaba-z 2025-08-09 16:42:19 +03:30
• 92a5d3a2eb fix bug of inventory entry - fix weight of quotas Mojtaba-z 2025-08-09 16:15:37 +03:30
• 365362b739 stake holders model, paginate organizations by order Mojtaba-z 2025-08-09 10:48:53 +03:30
• 68a764f5f7 change model device fields Mojtaba-z 2025-08-07 17:22:50 +03:30
• f8bd657ec8 fix pos device create error Mojtaba-z 2025-08-07 17:17:28 +03:30
• 8e143a0033 fix inventory edit weight bug - fix inventory document - set new validations for distribution Mojtaba-z 2025-08-07 16:59:17 +03:30
• 82b1dc3637 fix inventory entry document upload in update Mojtaba-z 2025-08-07 15:02:00 +03:30
• b6ef262c33 fix inventory balanve & remaining - import provider name in device serializer Mojtaba-z 2025-08-07 14:51:19 +03:30
• bc8c884678 fix role & role pernissions for user Mojtaba-z 2025-08-07 13:16:10 +03:30
• fe6417b1c3 fix user password bug Mojtaba-z 2025-08-07 10:54:00 +03:30
• 3420e9e832 add bank account to organization Mojtaba-z 2025-08-07 10:37:07 +03:30
• 91eafd8629 add bank account to organization - fix user password bug Mojtaba-z 2025-08-07 10:13:46 +03:30
• 3bcb24483e add bank account to organization - fix user password bug Mojtaba-z 2025-08-07 10:12:33 +03:30
• 482ae540fd fix edit password - organization fix childs Mojtaba-z 2025-08-07 09:45:02 +03:30
• 6477a35200 Merge branch 'main' of https://github.com/MNPC-IR/Rasaddam_Backend Mojtaba-z 2025-08-06 16:08:13 +03:30
• 1f8cca7973 create bank account for organization Mojtaba-z 2025-08-06 16:08:07 +03:30
• f19bd595ea merge 7nimor 2025-08-06 14:44:34 +03:30
• 717945beb7 update livestock_excel 7nimor 2025-08-06 14:43:33 +03:30
• e816ac000a Merge branch 'main' of https://github.com/MNPC-IR/Rasaddam_Backend Mojtaba-z 2025-08-06 14:27:59 +03:30
• 0696eba624 if role of user changed, permissions change Mojtaba-z 2025-08-06 14:27:44 +03:30
• 90ad35724b update livestock_excel 7nimor 2025-08-06 14:16:25 +03:30
• 30dcdb2db6 some changes Mojtaba-z 2025-08-06 13:32:50 +03:30
• d9d0537ac9 Merge branch 'main' of https://github.com/MNPC-IR/Rasaddam_Backend Mojtaba-z 2025-08-06 09:27:40 +03:30
• 2449780298 fix quota group to array Mojtaba-z 2025-08-06 09:27:24 +03:30
• 8dddce173e ceate excel for herd and livestock 7nimor 2025-08-06 09:25:55 +03:30
• 74ca5ba82a ceate excel for herd and livestock 7nimor 2025-08-06 09:25:13 +03:30
• 8d7af93498 ceate excel for herd and livestock 7nimor 2025-08-06 09:19:47 +03:30
• 0b53df4dfe sync role permissions with main permission on signal Mojtaba-z 2025-08-05 18:06:16 +03:30
• e51a3a31aa fix broker bug in organization -> organization type Mojtaba-z 2025-08-05 17:00:58 +03:30
• 445ea153c8 fix broker bug in organization -> organization type Mojtaba-z 2025-08-05 16:52:52 +03:30
• fdd9a5af4a organization def str Mojtaba-z 2025-08-05 16:40:44 +03:30
• 2bc1931def change on broker (organization type) - some changes on livestock & herd Mojtaba-z 2025-08-05 16:33:42 +03:30
• 7792e67b1e Adding live_stocks Action To HerdViewSet Mojtaba-z 2025-08-04 16:14:35 +03:30
• 3d39f673cd set search & filter on organization - change on herd in cooperative Mojtaba-z 2025-08-04 10:03:20 +03:30
• 04191c838b fix edit user bug Mojtaba-z 2025-08-03 17:59:20 +03:30
• 3bb528f4f1 rancher add province & city to serializer Mojtaba-z 2025-08-03 16:15:12 +03:30
• ebb8f3f6af Merge branch 'main' of https://github.com/MNPC-IR/Rasaddam_Backend Mojtaba-z 2025-08-03 16:03:18 +03:30
• 57d1034024 rancher setub Mojtaba-z 2025-08-03 16:03:01 +03:30
• f3f2eaca19 create my_products_stat_excel 7nimor 2025-08-03 13:57:34 +03:30
• ddc434d63e create my_products_stat_excel 7nimor 2025-08-03 13:56:59 +03:30
• 6ccbadbbdc related quotas Mojtaba-z 2025-08-03 11:52:29 +03:30
• 275b84467e Merge branch 'main' of https://github.com/MNPC-IR/Rasaddam_Backend Mojtaba-z 2025-08-03 10:36:20 +03:30
• d9a9cfde35 fix product stat signal Mojtaba-z 2025-08-03 10:36:00 +03:30