OSB-44: resolved conflicts

Author: sniedzielski

.gitignore

@@ -166,8 +166,31 @@ cython_debug/
 #  and can be added to the global gitignore or merged into this file.  For a more nuclear
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 #.idea/
+.idea/
 
 # PyPI configuration file
 .pypirc
 
-output*
+# Node
+node_modules/
+.vscode/
+
+# Output directories and files
+output*/
+output.*
+results/
+logs/
+
+# Local configuration files
+*.config.local
+config.local.*
+
+# Virtual Environment directory typically used with pipenv
+.venv/
+
+# Mac OS specific files
+.DS_Store
+
+# Windows specific files
+Thumbs.db
+desktop.ini

package-lock.json

@@ -0,0 +1,6 @@
+{
+  "dependencies": {
+    "js-yaml": "^4.1.0",
+    "jszip": "^3.10.1"
+  }
+}

package.json

@@ -0,0 +1,6 @@
+{
+  "menus": [],
+  "fePackages": ["ClaimModule"],
+  "bePackages": ["claim"],
+  "roles": []
+}

solution/modules/claim.json

@@ -0,0 +1,6 @@
+{
+  "menus": [],
+  "fePackages": ["ClaimBatchModule"],
+  "bePackages": ["claim_batch"],
+  "roles": []
+}

solution/modules/claim_batch.json

@@ -0,0 +1,6 @@
+{
+  "menus": [],
+  "fePackages": ["MedicalModule", "MedicalPriceListModule"],
+  "bePackages": ["medical", "medical_pricelist"],
+  "roles": []
+}

solution/modules/medical.json

@@ -0,0 +1,31 @@
+{
+  "menus": [
+    {
+      "position": 2,
+      "id": "AdministrationMainMenu",
+      "name": "Administration",
+      "icon": "administration-icon",
+      "description": "Administration",
+      "submenus": [
+        {
+          "position": 4,
+          "id": "admin.payers"
+        }
+      ]
+    }
+  ],
+  "fePackages": ["PayerModule"],
+  "bePackages": ["payer"],
+  "roles": [
+    {
+      "roleName": "LOCAL Administrator",
+      "code": "local_admin",
+      "permissions": [
+        "payer.payers",
+        "payer.create_payers",
+        "payer.update_payers",
+        "payer.delete_payers"
+      ]
+    }
+  ]
+}

solution/modules/payer.json

@@ -0,0 +1,6 @@
+{
+  "menus": [],
+  "fePackages": ["PaymentModule"],
+  "bePackages": ["payment"],
+  "roles": []
+}

solution/modules/payment.json

@@ -1,26 +1,22 @@
 {
   "menus": [
     {
-      "position":2,
-      "id": "EnrolmentMainMenu",
-      "name":"EnrolmentMainMenu",
-      "icon":"how-to-reg-icon",
-      "description":"Enrolment",
-         "submenus":[
-            {
-               "position":3,
-               "id":"iadmin.products"
-            }
-         ]
-      }
-  ],
-  "fePackages": [
-"ProductModule"
-  ],
-  "bePackages": [
-"policy"
+      "position": 2,
+      "id": "AdministrationMainMenu",
+      "name": "Administration",
+      "icon": "administration-icon",
+      "description": "Administration",
+      "submenus": [
+        {
+          "position": 2,
+          "id": "admin.products"
+        }
+      ]
+    }
   ],
-   "roles": [
+  "fePackages": ["ProductModule"],
+  "bePackages": ["product"],
+  "roles": [
     {
       "roleName": "LOCAL Administrator",
       "code": "local_admin",
@@ -32,5 +28,5 @@
         "product.duplicate_product"
       ]
     }
-   ]
-}
+  ]
+}