Merge branch 'niua-org:niua-dev' into niua-dev

niua-upyog · Nov 11, 2024 · e22955a · e22955a
2 parents 5be0cb8 + e430f49
commit e22955a
Show file tree

Hide file tree

Showing 12 changed files with 1,057 additions and 2,194 deletions.
diff --git a/data/pg/ACCESSCONTROL-ACTIONS-TEST/actions-test.json b/data/pg/ACCESSCONTROL-ACTIONS-TEST/actions-test.json
@@ -19096,6 +19096,31 @@
         "serviceCode": "MDMS",
         "code": "null",
         "path": ""
+    },
+    {
+        "id": 2888,
+        "name": "Street Vending Payment search",
+        "url": "/collection-services/payments/sv-services/_search",
+        "displayName": "Street Vending Payment search",
+        "orderNumber": 1,
+        "parentModule": "",
+        "enabled": false,
+        "serviceCode": "",
+        "code": "null",
+        "path": ""
+    },
+    {
+      "id": 2889,
+      "name": "Pet Payment search",
+      "url": "/collection-services/payments/pet-services/_search",
+      "displayName": "Pet Payment search",
+      "orderNumber": 1,
+      "parentModule": "",
+      "enabled": false,
+      "serviceCode": "",
+      "code": "null",
+      "path": ""
     }
+
   ]
 }
diff --git a/data/pg/ACCESSCONTROL-ROLEACTIONS/roleactions.json b/data/pg/ACCESSCONTROL-ROLEACTIONS/roleactions.json
@@ -28465,6 +28465,12 @@
       "actioncode": "",
       "tenantId": "pg"
     },
+    {
+      "rolecode": "ADS_CEMP",
+      "actionid": 1863,
+      "actioncode": "",
+      "tenantId": "pg"
+    },
     {
       "rolecode": "ADS_CEMP",
       "actionid": 2695,
@@ -28507,6 +28513,12 @@
       "actioncode": "",
       "tenantId": "pg"
     },
+    {
+      "rolecode": "SVCEMP",
+      "actionid": 2691,
+      "actioncode": "",
+      "tenantId": "pg"
+    },
     {
       "rolecode": "SVCEMP",
       "actionid": 2155,
@@ -29706,6 +29718,60 @@
         "actionid": 2887,
         "actioncode": "",
         "tenantId": "pg"
+    },
+    {
+      "rolecode": "SVCEMP",
+      "actionid": 2888,
+      "actioncode": "",
+      "tenantId": "pg"
+    },
+    {
+      "rolecode": "TVCEMPLOYEE",
+      "actionid": 2888,
+      "actioncode": "",
+      "tenantId": "pg"
+    },
+    {
+      "rolecode": "INSPECTIONOFFICER",
+      "actionid": 2888,
+      "actioncode": "",
+      "tenantId": "pg"
+    },
+    {
+      "rolecode": "CITIZEN",
+      "actionid": 2888,
+      "actioncode": "",
+      "tenantId": "pg"
+    },
+    {
+      "rolecode": "PTR_CEMP",
+      "actionid": 2889,
+      "actioncode": "",
+      "tenantId": "pg"
+    },
+    {
+      "rolecode": "PTR_APPROVER",
+      "actionid": 2889,
+      "actioncode": "",
+      "tenantId": "pg"
+    },
+    {
+      "rolecode": "PTR_VERIFIER",
+      "actionid": 2889,
+      "actioncode": "",
+      "tenantId": "pg"
+    },
+    {
+      "rolecode": "EMPLOYEE",
+      "actionid": 2889,
+      "actioncode": "",
+      "tenantId": "pg"
+    },
+    {
+      "rolecode": "CITIZEN",
+      "actionid": 2889,
+      "actioncode": "",
+      "tenantId": "pg"
     }
   ]
 }
diff --git a/data/pg/Advertisement/AdvServices.json b/data/pg/Advertisement/AdvServices.json
@@ -0,0 +1,19 @@
+{
+    "tenantId": "pg",
+    "moduleName": "Advertisement",
+    "AdvServices": [
+        {
+            "communityHallId": "1",
+            "name": "Sector 54 Phase 2",
+            "code": "Sector_54_Phase_2",
+            "geoLocation": "28.564143,77.123490",
+            "contactDetails": "011-25695450",
+            "hallDescription": "Two Halls, One Ground floor & One First floor. Can accommodate 200-250 people.",
+            "address": "Sector 54 Phase 2",
+            "type": "HALL",
+            "termsAndCondition": "1. Advertisements must comply with all applicable laws and regulations.\n2. The Provider reserves the right to approve or reject any advertisement submitted.\n3. Advertisements should not contain any offensive, illegal, or misleading content.\n4. Advertisers are responsible for ensuring their content does not infringe any intellectual property rights.\n5. Payment must be made in full at the time of booking.\n6. The advertisement placement is subject to availability and approval.\n7. The Advertiser will be charged a cancellation fee if the ad is canceled after booking.\n8. The Provider is not responsible for any losses caused by a delay in the advertisement placement.\n9. Advertisers must comply with local noise, safety, and health regulations.\n10. All advertisements are subject to the Provider’s final approval and may be modified as needed.",
+            "headerImageUrl": "",
+            "active": true
+        }
+    ]
+}
diff --git a/data/pg/Advertisement/CalculationType.json b/data/pg/Advertisement/CalculationType.json
@@ -14,14 +14,14 @@
         {
           "applicationType": "ADVERTISEMENT_BOOKING",
           "serviceType": "NEW_BOOKING",
-          "feeType": "CGST",
+          "feeType": "ADV_CGST",
           "amount": 9,
           "taxApplicable": false
         },
         {
           "applicationType": "ADVERTISEMENT_BOOKING",
           "serviceType": "NEW_BOOKING",
-          "feeType": "SGST",
+          "feeType": "ADV_CGST",
           "amount": 9,
           "taxApplicable": false
         }
@@ -37,14 +37,14 @@
         {
           "applicationType": "ADVERTISEMENT_BOOKING",
           "serviceType": "NEW_BOOKING",
-          "feeType": "CGST",
+          "feeType": "ADV_CGST",
           "amount": 9,
           "taxApplicable": false
         },
         {
           "applicationType": "ADVERTISEMENT_BOOKING",
           "serviceType": "NEW_BOOKING",
-          "feeType": "SGST",
+          "feeType": "ADV_CGST",
           "amount": 9,
           "taxApplicable": false
         }