Skip to content

Commit

Permalink
Merge pull request #6480 from hmislk/Issue#6464
Browse files Browse the repository at this point in the history 
Issue#6464 Closes #6464
  • Loading branch information
@DeshaniPubudu
DeshaniPubudu authored Jul 21, 2024
2 parents 8f48264 + edd89ad commit 46ebe70
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
12 changes: 6 additions & 6 deletions src/main/webapp/admin/pricing/membership/membership_scheme.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,15 +88,15 @@
>
</p:commandButton>
</f:facet>
<h:panelGrid id="gpDetailText" columns="2">
<p:outputLabel for="txtName" id="lblName" value="Name"></p:outputLabel>
<p:inputText autocomplete="off" required="true" class="mb-1" id="txtName" value="#{membershipSchemeController.current.name}" ></p:inputText>
<p:panelGrid id="gpDetailText" columns="2" class="w-100">
<p:outputLabel for="txtName" id="lblName" value="Name" class="w-100"></p:outputLabel>
<p:inputText autocomplete="off" required="true" class="mb-1 w-100" id="txtName" value="#{membershipSchemeController.current.name}" ></p:inputText>

<p:outputLabel for="txtCode" id="lblCode" value="Code" ></p:outputLabel>
<p:inputText autocomplete="off" id="txtCode" class="mb-1" value="#{membershipSchemeController.current.code}" ></p:inputText>
<p:inputText autocomplete="off" id="txtCode" class="mb-1 w-100" value="#{membershipSchemeController.current.code}" ></p:inputText>

<p:outputLabel for="txtPoints" id="lblPoints" value="Pointes for 1000" ></p:outputLabel>
<p:inputText autocomplete="off" id="txtPoints" class="mb-1" value="#{membershipSchemeController.current.pointesForThousand}" ></p:inputText>
<p:inputText autocomplete="off" id="txtPoints" class="mb-1 w-100" value="#{membershipSchemeController.current.pointesForThousand}" ></p:inputText>


<p:outputLabel for="lstDiscountScheme" id="lblDs" value="Discount Scheme" ></p:outputLabel>
Expand All @@ -111,7 +111,7 @@
<f:ajax render="gpDetail" execute="lstSelect" >
</f:ajax>
</p:selectOneMenu>
</h:panelGrid>
</p:panelGrid>
</p:panel>

<p:messages id="msg" />
Expand Down
20 changes: 10 additions & 10 deletions src/main/webapp/admin/pricing/payment_scheme.xhtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,23 +75,23 @@
>
</p:commandButton>
</f:facet>
<h:panelGrid id="gpDetail" columns="1" >
<h:panelGrid id="gpDetailText" columns="2">
<p:panelGrid id="gpDetail" columns="1" class="w-100" >
<h:panelGrid id="gpDetailText" columns="2" class="w-100 ">
<h:outputText id="lblName" value="Name" ></h:outputText>
<p:inputText autocomplete="off" id="txtName" value="#{paymentSchemeController.current.name}" class="w-100" ></p:inputText>
<p:inputText autocomplete="off" id="txtName" value="#{paymentSchemeController.current.name}" class="w-100 my-1" ></p:inputText>
<h:outputText id="lblPrintingName" value="Printing Name" ></h:outputText>
<p:inputText autocomplete="off" id="txtPrintingName" value="#{paymentSchemeController.current.printingName}" ></p:inputText>
<p:inputText autocomplete="off" id="txtPrintingName" value="#{paymentSchemeController.current.printingName}" class="w-100 my-1"></p:inputText>
<h:outputText id="lblOrder" value="Order No" />
<p:inputText autocomplete="off" id="txtOrder" value="#{paymentSchemeController.current.orderNo}" />
<p:inputText autocomplete="off" id="txtOrder" value="#{paymentSchemeController.current.orderNo}" class="w-100 my-1"/>
<h:outputLabel rendered="#{paymentSchemeController.current!=null}" value="Valid for Pharmacy" />
<p:selectBooleanCheckbox rendered="#{paymentSchemeController.current!=null}" value="#{paymentSchemeController.current.validForPharmacy}" ></p:selectBooleanCheckbox>
<h:outputLabel rendered="#{paymentSchemeController.current!=null}" value="Valid for Billing" />
<h:outputLabel rendered="#{paymentSchemeController.current!=null}" class="my-1" value="Valid for Billing" />
<p:selectBooleanCheckbox rendered="#{paymentSchemeController.current!=null}" value="#{paymentSchemeController.current.validForBilledBills}" ></p:selectBooleanCheckbox>
<h:outputLabel rendered="#{paymentSchemeController.current!=null}" value="Valid for Cancellings and Refunds" />
<h:outputLabel rendered="#{paymentSchemeController.current!=null}" class="my-1" value="Valid for Cancellings and Refunds" />
<p:selectBooleanCheckbox rendered="#{paymentSchemeController.current!=null}" value="#{paymentSchemeController.current.validForCrBills}" ></p:selectBooleanCheckbox>
<h:outputLabel rendered="#{paymentSchemeController.current!=null}" value="Valid for Channeling" />
<h:outputLabel rendered="#{paymentSchemeController.current!=null}" class="my-1" value="Valid for Channeling" />
<p:selectBooleanCheckbox rendered="#{paymentSchemeController.current!=null}" value="#{paymentSchemeController.current.validForChanneling}"></p:selectBooleanCheckbox>
<h:outputText value="Creator" ></h:outputText>
<h:outputText value="Creator" class="my-1" ></h:outputText>
<h:outputText value="#{paymentSchemeController.current.creater.webUserPerson.name}" />
<h:outputText value="Created At" ></h:outputText>
<p:outputLabel value="#{paymentSchemeController.current.createdAt}" >
Expand All @@ -103,7 +103,7 @@

<p:defaultCommand target="btnSave"/>
</h:panelGrid>
</h:panelGrid>
</p:panelGrid>
</p:panel>
</div>
</div>
Expand Down

0 comments on commit 46ebe70

Please sign in to comment.