From 63cae412a94f27ecc1a583ce2a1cd7cdb74b2d3e Mon Sep 17 00:00:00 2001 From: DamithDeshan Date: Sat, 27 Jul 2024 10:34:07 +0530 Subject: [PATCH 1/3] Signed-off-by: DamithDeshan --- .../java/com/divudi/bean/common/UserPrivilageController.java | 3 ++- src/main/java/com/divudi/data/Privileges.java | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/divudi/bean/common/UserPrivilageController.java b/src/main/java/com/divudi/bean/common/UserPrivilageController.java index e759b0b88b..0a22c2ed60 100644 --- a/src/main/java/com/divudi/bean/common/UserPrivilageController.java +++ b/src/main/java/com/divudi/bean/common/UserPrivilageController.java @@ -339,6 +339,7 @@ private TreeNode createPrivilegeHolderTreeNodes() { TreeNode paymentCancelNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.PaymentBillCancel, "Payment Cancel"), paymentNode); TreeNode paymentRefundNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.PaymentBillRefund, "Payment Refund"), paymentNode); TreeNode paymentReactivationNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.PaymentBillReactivation, "Payment Reactivation"), paymentNode); + TreeNode changeCreditLimit = new DefaultTreeNode(new PrivilegeHolder(Privileges.ChangeCreditLimitInCC, "Change Credit Limit in Collecting Centre"), paymentNode); TreeNode reportsNode = new DefaultTreeNode(new PrivilegeHolder(null, "Reports"), allNode); TreeNode reportsMenuNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.Reports, "Reports Menu"), reportsNode); @@ -484,7 +485,7 @@ private TreeNode createPrivilegeHolderTreeNodes() { TreeNode cashInNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.CashTransactionCashIn, "Cash In"), cashTransactionNode); TreeNode cashOutNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.CashTransactionCashOut, "Cash Out"), cashTransactionNode); TreeNode listToCashReceiveNode = new DefaultTreeNode(new PrivilegeHolder(Privileges.CashTransactionListToCashRecieve, "List To Cash Receive"), cashTransactionNode); - + //Pharmacy TreeNode retailTransaction = new DefaultTreeNode("Pharmacy Retail Transaction", pharmacyNode); TreeNode retailTransactionMenu = new DefaultTreeNode(new PrivilegeHolder(Privileges.PharmacyRetailTransactionMenue, "Pharmacy Retail Transaction Menu"), retailTransaction); diff --git a/src/main/java/com/divudi/data/Privileges.java b/src/main/java/com/divudi/data/Privileges.java index 121edd0904..3ce84aac20 100644 --- a/src/main/java/com/divudi/data/Privileges.java +++ b/src/main/java/com/divudi/data/Privileges.java @@ -25,6 +25,7 @@ public enum Privileges { Store, Search, CashTransaction, + ChangeCreditLimitInCC, //Submenu Privileges OpdBilling, OpdCollectingCentreBillingMenu, From 92537460e22a25588a7a9b695a95073fc2845be6 Mon Sep 17 00:00:00 2001 From: DamithDeshan Date: Sat, 27 Jul 2024 10:34:12 +0530 Subject: [PATCH 2/3] Signed-off-by: DamithDeshan --- src/main/webapp/resources/ezcomp/menu.xhtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/resources/ezcomp/menu.xhtml b/src/main/webapp/resources/ezcomp/menu.xhtml index af0538dbf1..d660b8d6dd 100644 --- a/src/main/webapp/resources/ezcomp/menu.xhtml +++ b/src/main/webapp/resources/ezcomp/menu.xhtml @@ -1088,7 +1088,7 @@ - + From 8afb3c459f5c0c5b231000f7c5019bfe4f7ca693 Mon Sep 17 00:00:00 2001 From: DamithDeshan Date: Sat, 27 Jul 2024 10:34:39 +0530 Subject: [PATCH 3/3] closes#6635 Signed-off-by: DamithDeshan --- nb-configuration.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nb-configuration.xml b/nb-configuration.xml index f734d49765..a7ab4ee3a4 100644 --- a/nb-configuration.xml +++ b/nb-configuration.xml @@ -18,7 +18,7 @@ Any value defined here will override the pom.xml file value but is only applicab false true JSP - all + none /less:/css false false @@ -27,7 +27,6 @@ Any value defined here will override the pom.xml file value but is only applicab /scss:/css js/libs pfv5ee8 - false none