diff --git a/src/main/java/com/divudi/bean/common/NavigationController.java b/src/main/java/com/divudi/bean/common/NavigationController.java
index 07bdb5c9a0..483a7f320f 100644
--- a/src/main/java/com/divudi/bean/common/NavigationController.java
+++ b/src/main/java/com/divudi/bean/common/NavigationController.java
@@ -154,10 +154,6 @@ public String navigateToPaymentSchemeDiscountOpdByDepartment() {
         return "/admin/pricing/payment_scheme_discount_opd_by_department?faces-redirect=true";
     }
     
-    public String navigateToPaymentSchemeDiscountforCreditCompany() {
-        return "/admin/pricing/payment_scheme_discount_for_credit_company?faces-redirect=true";
-    }
-
     public String navigateToPaymentSchemeDiscountOpdBySite() {
         return "/admin/pricing/payment_scheme_discount_opd_by_site?faces-redirect=true";
     }
diff --git a/src/main/java/com/divudi/bean/membership/OpdMemberShipDiscountController.java b/src/main/java/com/divudi/bean/membership/OpdMemberShipDiscountController.java
index f2ccf957ef..1947773d88 100644
--- a/src/main/java/com/divudi/bean/membership/OpdMemberShipDiscountController.java
+++ b/src/main/java/com/divudi/bean/membership/OpdMemberShipDiscountController.java
@@ -122,68 +122,6 @@ public void saveSelectedDepartmentPaymentScheme() {
 
     }
 
-    public void saveSelectedCompanyPaymentScheme() {
-        if (paymentScheme == null) {
-            JsfUtil.addErrorMessage("Please select a Payment Scheme");
-            return;
-        }
-        if (selectedCreditCompany == null) {
-            JsfUtil.addErrorMessage("Please select a CreditCompany.");
-            return;
-        }
-
-        if (margin > 100.0 || margin < 0.0) {
-            JsfUtil.addErrorMessage("Margin is Invalid.");
-            return;
-        }
-
-        // Create new PriceMatrix
-        PriceMatrix a = new PaymentSchemeDiscount();
-        a.setPaymentScheme(paymentScheme);
-        a.setCreditCompany(selectedCreditCompany);
-        a.setDiscountPercent(margin);
-        a.setPaymentMethod(PaymentMethod.Credit);
-        a.setCreatedAt(new Date());
-        a.setCreater(sessionController.getLoggedUser());
-        getFacade().create(a);
-
-        System.out.println("New PriceMatrix Saved Successfully (" + a.getId() + ")");
-        JsfUtil.addSuccessMessage("Saved Successfully");
-
-        // Reload PriceMatrix
-        fillCompanyPaymentSchemes();
-
-        // Clear Values
-        selectedCreditCompany = null;
-        margin = 0.0;
-        company = null;
-
-    }
-
-    public void fillCompanyPaymentSchemes() {
-        if (paymentScheme == null) {
-            JsfUtil.addErrorMessage("Please select a Payment Scheme");
-            return;
-        }
-
-        String sql;
-        HashMap hm = new HashMap();
-        sql = "select a from PaymentSchemeDiscount a "
-                + " where a.retired=false"
-                + " and a.paymentScheme=:pm "
-                + " and a.category is null "
-                + " and a.creditCompany is not null ";
-                
-        if (company != null) {
-            sql += " and a.creditCompany =:cmb";
-            hm.put("cmb", company);
-        }
-        sql += " order by a.paymentScheme.name, a.creditCompany.name";
-        
-        hm.put("pm", paymentScheme);
-        items = getFacade().findByJpql(sql, hm);
-    }
-
     public void saveSelectedSitePaymentScheme() {
         PriceMatrix a = new PaymentSchemeDiscount();
         saveSite(a);
@@ -1092,23 +1030,9 @@ public void createItemsCategoryPharmacyPaymentMethod() {
     }
 
     public void onEdit(PriceMatrix tmp) {
-        if (tmp.getPaymentScheme() == null) {
-            JsfUtil.addErrorMessage("Please select a Payment Scheme");
-            return;
-        }
-        if (tmp.getCreditCompany() == null) {
-            JsfUtil.addErrorMessage("Please select a CreditCompany.");
-            return;
-        }
-
-        if (tmp.getDiscountPercent() > 100.0 || tmp.getDiscountPercent() < 0.0) {
-            JsfUtil.addErrorMessage("Margin is Invalid.");
-            return;
-        }
         getFacade().edit(tmp);
         JsfUtil.addSuccessMessage("Update Successfully");
         clearInstanceVars();
-
     }
 
     public Category getRoomLocation() {
diff --git a/src/main/webapp/admin/pricing/payment_scheme_discount_for_credit_company.xhtml b/src/main/webapp/admin/pricing/payment_scheme_discount_for_credit_company.xhtml
deleted file mode 100644
index 82baa513a3..0000000000
--- a/src/main/webapp/admin/pricing/payment_scheme_discount_for_credit_company.xhtml
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
-      xmlns:p="http://primefaces.org/ui"
-      xmlns:h="http://xmlns.jcp.org/jsf/html"
-      xmlns:f="http://xmlns.jcp.org/jsf/core"
-      >
-
-    <h:body>
-
-        <ui:composition template="/admin/pricing/index.xhtml">
-
-            <ui:define name="subcontent">
-                <h:form>
-                    <p:panel header="Discount for Credit Company" id="reportPrint">
-
-                        <p:panel header="Add new Matrix" >
-
-
-                            <p:panelGrid columns="2" >
-                                <h:outputLabel value="Discount Scheme"/>
-                                <p:autoComplete 
-                                    forceSelection="true" 
-                                    class="w-100"
-                                    inputStyleClass="w-100"
-                                    value="#{opdMemberShipDiscountController.paymentScheme}" 
-                                    completeMethod="#{paymentSchemeController.completePaymentScheme}" 
-                                    var="mem" 
-                                    placeholder="Select the Discount Scheme"
-                                    itemLabel="#{mem.name}" 
-                                    itemValue="#{mem}" >
-                                </p:autoComplete>
-
-                                <h:outputLabel value="Credit Company " />
-                                <p:autoComplete 
-                                    forceSelection="true" 
-                                    value="#{opdMemberShipDiscountController.selectedCreditCompany}" 
-                                    completeMethod="#{institutionController.completeCreditCompany}" 
-                                    var="mem" 
-                                    placeholder="Select the Credit Company"
-                                    itemLabel="#{mem.name}" 
-                                    itemValue="#{mem}" 
-                                    class="w-100"
-                                    maxResults="20"
-                                    inputStyleClass="w-100">
-                                </p:autoComplete>
-
-                                <h:outputLabel value="Discount" ></h:outputLabel>
-                                <h:panelGroup >
-                                    <div class="d-flex gap-4">
-                                        <p:inputText 
-                                            id="decimal" 
-                                            value="#{opdMemberShipDiscountController.margin}" 
-                                            class="text-end" 
-                                            onfocus="this.select()">
-                                            <f:convertNumber pattern="##0.00"/>
-                                        </p:inputText>
-                                        <p:slider for="decimal" minValue="0" maxValue="100" step="0.1" range="min" class="w-100 mt-3" />
-                                    </div>
-                                </h:panelGroup>
-                            </p:panelGrid>
-
-                            <div class="d-flex justify-content-end">
-                                <p:commandButton 
-                                    id="btnAdd" 
-                                    value="Add Matrix" 
-                                    ajax="false" 
-                                    icon="fa fa-plus"
-                                    class="mx-1 ui-button-success"
-                                    action="#{opdMemberShipDiscountController.saveSelectedCompanyPaymentScheme()}" >
-                                </p:commandButton>
-                            </div>
-
-                        </p:panel>
-
-                        <p:panel class="mt-3">
-                            <f:facet name="header">
-                                <div class="d-flex justify-content-between">
-                                    <h:outputLabel value="Price Matrix" class="mt-2"/>
-                                    <div class="d-flex justify-content-end gap-2" style="width: 550px;">
-                                        <p:autoComplete 
-                                            forceSelection="true" 
-                                            value="#{opdMemberShipDiscountController.company}" 
-                                            completeMethod="#{institutionController.completeCreditCompany}" 
-                                            var="mem" 
-                                            placeholder="Select the Credit Company"
-                                            itemLabel="#{mem.name}" 
-                                            itemValue="#{mem}" 
-                                            class="w-100"
-                                            maxResults="20"
-                                            inputStyleClass="w-100">
-                                        </p:autoComplete>
-                                        <p:commandButton 
-                                            ajax="false" 
-                                            value="Fill" 
-                                            icon="fa fa-refresh"
-                                            action="#{opdMemberShipDiscountController.fillCompanyPaymentSchemes()}" >
-                                        </p:commandButton>
-                                    </div>
-                                </div>
-                            </f:facet>
-
-                            <p:dataTable 
-                                id="inwd" 
-                                value="#{opdMemberShipDiscountController.items}"
-                                var="a" 
-                                editable="true" 
-                                scrollable="true" 
-                                scrollHeight="500">
-
-                                <p:column headerText="Discount Scheme" style="padding: 6px;">
-                                    <p:autoComplete 
-
-                                        forceSelection="true" 
-                                        value="#{a.paymentScheme}" 
-                                        completeMethod="#{paymentSchemeController.completePaymentScheme}" 
-                                        var="mem"
-                                        class="w-100"
-                                        itemLabel="#{mem.name}" 
-                                        itemValue="#{mem}"
-                                        inputStyleClass="w-100">
-                                        <p:column style="padding: 6px;">
-                                            <h:outputLabel value="#{mem.name}" ></h:outputLabel>
-                                        </p:column>
-                                    </p:autoComplete>
-                                </p:column>
-
-                                <p:column headerText="Credit Company" style="padding: 6px;">
-                                    <p:autoComplete 
-                                        forceSelection="true" 
-                                        value="#{a.creditCompany}" 
-                                        completeMethod="#{institutionController.completeCreditCompany}" 
-                                        var="dep"
-                                        class="w-100"
-                                        itemLabel="#{dep.name}" 
-                                        itemValue="#{dep}"
-                                        inputStyleClass="w-100">
-                                        <p:column headerText="Code" width="2em;" style="padding: 6px;">
-                                            <h:outputLabel value="#{dep.code}" ></h:outputLabel>
-                                        </p:column>
-                                        <p:column headerText="Name" width="3em;" style="padding: 6px;">
-                                            <h:outputLabel value="#{dep.name}" ></h:outputLabel>
-                                        </p:column>
-                                    </p:autoComplete>
-
-                                </p:column>
-
-                                <p:column headerText="Discount Percent" width="10em;" style="padding: 6px;">
-                                    <p:inputText 
-                                        class="text-end w-100" 
-                                        onfocus="this.select()"
-                                        autocomplete="off" 
-                                        value="#{a.discountPercent}" >
-                                        <f:convertNumber pattern="#,##0.00"/>
-                                    </p:inputText>
-                                </p:column>
-
-                                <p:column headerText="Action" width="13em;" style="padding: 6px;">
-                                    <div class="d-flex gap-2">
-                                        <p:commandButton 
-                                            ajax="false" 
-                                            value="Update" 
-                                            class="ui-button-warning"
-                                            icon="fa fa-pencil"
-                                            action="#{opdMemberShipDiscountController.onEdit(a)}">
-                                        </p:commandButton>
-
-                                        <p:commandButton 
-                                            ajax="false" 
-                                            value="Delete" 
-                                            class="ui-button-danger"
-                                            icon="fa fa-trash"
-                                            action="#{opdMemberShipDiscountController.deleteDepartmentPaymentScheme()}">
-                                            <f:setPropertyActionListener value="#{a}" target="#{opdMemberShipDiscountController.current}"/>
-                                        </p:commandButton>
-                                    </div>
-
-                                </p:column>
-
-                            </p:dataTable>
-
-
-                        </p:panel>
-
-                    </p:panel>
-
-                </h:form>
-            </ui:define>
-
-
-        </ui:composition>
-
-    </h:body>
-</html>