Merge pull request #326 from mkumar-02/1.3.0-temp

Merged develop into 1.3. Fixed g2pconnect json serialization. Fixed minor Odools errors.

Author: shibu-narayanan

.gitignore

@@ -49,6 +49,7 @@ coverage.xml
 # Visual Studio cache/options directory
 .vs/
 .vscode
+**/odools.toml
 
 # OSX Files
 .DS_Store

README.md

@@ -51,6 +51,7 @@ addon | version | maintainers | summary
 [g2p_proxy_means_test](g2p_proxy_means_test/) | 17.0.1.3.0 |  | G2P: Proxy Means Test
 [g2p_reimbursement_portal](g2p_reimbursement_portal/) | 17.0.1.3.0 |  | G2P Reimbursement Portal
 [g2p_social_registry_importer](g2p_social_registry_importer/) | 17.0.1.3.0 |  | Import records from Social Registry
+[g2p_support_desk](g2p_support_desk/) | 17.0.1.3.0 |  | OpenG2P Support Desk Management System
 [g2p_theme](g2p_theme/) | 17.0.1.3.0 |  | OpenG2P Theme
 
 

g2p_bridge_configuration/models/payment_manager.py

@@ -46,7 +46,9 @@ def publish_bridge_benefit_program(self):
                 },
             }
 
-            token = self.create_jwt_token(json.dumps(data, separators=(",", ":")))
+            token = self.create_jwt_token(
+                json.dumps(data, indent=None, separators=(",", ":"), sort_keys=True)
+            )
             headers = {
                 "Accept": "application/json",
                 "Content-Type": "application/json",

g2p_payment_g2p_connect/models/cycle.py

@@ -37,7 +37,9 @@ def generate_summary(self):
                 "message": self.disbursement_envelope_id,
             }
 
-            token = payment_manager.create_jwt_token(json.dumps(data, separators=(",", ":")))
+            token = payment_manager.create_jwt_token(
+                json.dumps(data, indent=None, separators=(",", ":"), sort_keys=True)
+            )
             headers = {
                 "Accept": "application/json",
                 "Content-Type": "application/json",

g2p_payment_g2p_connect/models/payment_manager.py

@@ -179,7 +179,9 @@ def _send_payments(self, batches):
                 )
             try:
                 _logger.info("G2P Bridge Disbursement Batch Data: %s", batch_data)
-                token = self.create_jwt_token(json.dumps(batch_data, separators=(",", ":")))
+                token = self.create_jwt_token(
+                    json.dumps(batch_data, indent=None, separators=(",", ":"), sort_keys=True)
+                )
                 headers = {
                     "Accept": "application/json",
                     "Content-Type": "application/json",
@@ -268,7 +270,9 @@ def payments_status_check(self, id_):
             }
             try:
                 _logger.info("G2P Connect Disbursement Status Data: %s", status_data)
-                token = payment_manager.create_jwt_token(json.dumps(status_data, separators=(",", ":")))
+                token = payment_manager.create_jwt_token(
+                    json.dumps(status_data, indent=None, separators=(",", ":"), sort_keys=True)
+                )
                 headers = {
                     "Accept": "application/json",
                     "Content-Type": "application/json",
@@ -388,7 +392,9 @@ def _create_envelope_g2p_bridge(self, cycle):
             },
         }
         try:
-            token = self.create_jwt_token(json.dumps(envelope_request_data, separators=(",", ":")))
+            token = self.create_jwt_token(
+                json.dumps(envelope_request_data, indent=None, separators=(",", ":"), sort_keys=True)
+            )
             headers = {
                 "Accept": "application/json",
                 "Content-Type": "application/json",

g2p_program_registrant_info/wizard/g2p_program_registrant_info_wizard.py

@@ -60,8 +60,8 @@ def jsonize_form_data(self, data, program, membership=None):
     @api.model
     def add_files_to_store(self, files, store, program_membership=None, tags=None):
         file_details = []
-        DOC_TAGS = self.env["g2p.document.tag"]
         try:
+            DOC_TAGS = self.env["g2p.document.tag"]
             for file in files:
                 if file and store:
                     document_file = self.env["storage.file"].create(

g2p_programs/models/managers/payment_manager.py

@@ -37,7 +37,7 @@ class BasePaymentManager(models.AbstractModel):
     name = fields.Char("Manager Name", required=True)
     program_id = fields.Many2one("g2p.program", string="Program", required=True)
 
-    def prepare_payments(self, entitlements):
+    def prepare_payments(self, cycle, entitlements):
         """
         This method is used to prepare the payment list of the entitlements.
         :param entitlements: The entitlements.
@@ -142,7 +142,7 @@ def constrains_batch_tag_ids(self):
                 if rec.batch_tag_ids.sorted("order")[-1].domain != "[]":
                     raise ValidationError(_("Last tag in the Batch Tags list must contain empty domain."))
 
-    def prepare_payments(self, cycle, entitlements=None):
+    def prepare_payments(self, cycle, entitlements):
         if not entitlements:
             entitlements = cycle.entitlement_ids.filtered(lambda a: a.state == "approved")
         else:

g2p_social_registry_importer/models/fetch_social_registry_beneficiary.py

@@ -141,7 +141,7 @@ def test_connection(self):
                 },
             }
 
-    @api.onchange("registry")
+    @api.onchange("target_registry")
     def onchange_target_registry(self):
         for rec in self:
             rec.target_program = None

g2p_support_desk/README.md

@@ -0,0 +1,11 @@
+# OpenG2P Support Desk Management System
+
+This module provides a comprehensive support desk management system with:
+
+- Ticket Management
+- Team Management
+- SLA Tracking
+- Knowledge Base
+- Beneficiary Portal Access
+
+Refer to https://docs.openg2p.org.

g2p_support_desk/__init__.py

@@ -0,0 +1 @@
+from . import models