UOCL-319: removing erroneous button on voucher payment screen

This commit is contained in:
2026-04-17 17:50:04 +01:00
parent c70dc08ef5
commit 05de23afe8
2 changed files with 148 additions and 180 deletions
@@ -40,10 +40,6 @@
<EmptySpace type="unrelated" max="-2" attributes="0"/> <EmptySpace type="unrelated" max="-2" attributes="0"/>
<Component id="m_jVoucher" min="-2" max="-2" attributes="0"/> <Component id="m_jVoucher" min="-2" max="-2" attributes="0"/>
</Group> </Group>
<Group type="102" alignment="0" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Component id="jButton1" min="-2" max="-2" attributes="0"/>
</Group>
</Group> </Group>
<EmptySpace min="0" pref="0" max="32767" attributes="0"/> <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
</Group> </Group>
@@ -87,9 +83,7 @@
<Component id="webLblCustomer" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="webLblCustomer" alignment="3" min="-2" max="-2" attributes="0"/>
<Component id="webLblcustomerName" alignment="3" min="-2" max="-2" attributes="0"/> <Component id="webLblcustomerName" alignment="3" min="-2" max="-2" attributes="0"/>
</Group> </Group>
<EmptySpace min="-2" pref="33" max="-2" attributes="0"/> <EmptySpace min="-2" pref="241" max="-2" attributes="0"/>
<Component id="jButton1" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
</Group> </Group>
</Group> </Group>
</DimensionLayout> </DimensionLayout>
@@ -166,43 +160,43 @@
</Property> </Property>
</Properties> </Properties>
</Component> </Component>
<Component class="com.alee.laf.label.WebLabel" name="webLblCustomer"> <Component class="javax.swing.JLabel" name="webLblCustomer">
<Properties> <Properties>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="pos_messages.properties" key="label.customer" replaceFormat="AppLocal.getIntString(&quot;label.customer&quot;)"/>
</Property>
<Property name="toolTipText" type="java.lang.String" value=""/>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor"> <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Arial" size="18" style="1"/> <Font name="Arial" size="18" style="1"/>
</Property> </Property>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[100, 30]"/>
</Property>
</Properties>
</Component>
<Component class="com.alee.laf.label.WebLabel" name="webLblcustomerName">
<Properties>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor"> <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="pos_messages.properties" key="label.customer" replaceFormat="AppLocal.getIntString(&quot;label.customer&quot;)"/> <ResourceString bundle="pos_messages.properties" key="label.customer" replaceFormat="AppLocal.getIntString(&quot;label.customer&quot;)"/>
</Property> </Property>
<Property name="toolTipText" type="java.lang.String" value=""/> <Property name="toolTipText" type="java.lang.String" value=""/>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Arial" size="14" style="0"/>
</Property>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[100, 30]"/> <Dimension value="[100, 30]"/>
</Property> </Property>
</Properties> </Properties>
</Component> </Component>
<Component class="com.alee.laf.label.WebLabel" name="voucherStatus"> <Component class="javax.swing.JLabel" name="webLblcustomerName">
<Properties> <Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Arial" size="14" style="0"/>
</Property>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="pos_messages.properties" key="label.customer" replaceFormat="AppLocal.getIntString(&quot;label.customer&quot;)"/>
</Property>
<Property name="toolTipText" type="java.lang.String" value=""/>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[100, 30]"/>
</Property>
</Properties>
</Component>
<Component class="javax.swing.JLabel" name="voucherStatus">
<Properties>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Arial" size="14" style="0"/>
</Property>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor"> <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="pos_messages.properties" key="label.voucherStatus" replaceFormat="AppLocal.getIntString(&quot;label.voucherStatus&quot;)"/> <ResourceString bundle="pos_messages.properties" key="label.voucherStatus" replaceFormat="AppLocal.getIntString(&quot;label.voucherStatus&quot;)"/>
</Property> </Property>
<Property name="toolTipText" type="java.lang.String" value=""/> <Property name="toolTipText" type="java.lang.String" value=""/>
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
<Font name="Arial" size="14" style="0"/>
</Property>
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor"> <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
<Dimension value="[100, 30]"/> <Dimension value="[100, 30]"/>
</Property> </Property>
@@ -224,14 +218,6 @@
</Property> </Property>
</Properties> </Properties>
</Component> </Component>
<Component class="javax.swing.JButton" name="jButton1">
<Properties>
<Property name="text" type="java.lang.String" value="jButton1"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton1ActionPerformed"/>
</Events>
</Component>
</SubComponents> </SubComponents>
</Container> </Container>
<Container class="javax.swing.JPanel" name="jPanel11"> <Container class="javax.swing.JPanel" name="jPanel11">
@@ -191,11 +191,10 @@ public class JPaymentVoucher extends javax.swing.JPanel implements JPaymentInter
m_jVoucher = new javax.swing.JComboBox(); m_jVoucher = new javax.swing.JComboBox();
jLabel1 = new javax.swing.JLabel(); jLabel1 = new javax.swing.JLabel();
m_jMoneyEuros = new javax.swing.JLabel(); m_jMoneyEuros = new javax.swing.JLabel();
webLblCustomer = new com.alee.laf.label.WebLabel(); webLblCustomer = new javax.swing.JLabel();
webLblcustomerName = new com.alee.laf.label.WebLabel(); webLblcustomerName = new javax.swing.JLabel();
voucherStatus = new com.alee.laf.label.WebLabel(); voucherStatus = new javax.swing.JLabel();
jLabel6 = new javax.swing.JLabel(); jLabel6 = new javax.swing.JLabel();
jButton1 = new javax.swing.JButton();
jPanel11 = new javax.swing.JPanel(); jPanel11 = new javax.swing.JPanel();
jPanel12 = new javax.swing.JPanel(); jPanel12 = new javax.swing.JPanel();
m_jKeys = new com.unicenta.editor.JEditorKeys(); m_jKeys = new com.unicenta.editor.JEditorKeys();
@@ -248,13 +247,6 @@ public class JPaymentVoucher extends javax.swing.JPanel implements JPaymentInter
jLabel6.setText(AppLocal.getIntString("label.voucherStatus")); // NOI18N jLabel6.setText(AppLocal.getIntString("label.voucherStatus")); // NOI18N
jLabel6.setPreferredSize(new java.awt.Dimension(100, 30)); jLabel6.setPreferredSize(new java.awt.Dimension(100, 30));
jButton1.setText("jButton1");
jButton1.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
jButton1ActionPerformed(evt);
}
});
javax.swing.GroupLayout jPanel4Layout = new javax.swing.GroupLayout(jPanel4); javax.swing.GroupLayout jPanel4Layout = new javax.swing.GroupLayout(jPanel4);
jPanel4.setLayout(jPanel4Layout); jPanel4.setLayout(jPanel4Layout);
jPanel4Layout.setHorizontalGroup( jPanel4Layout.setHorizontalGroup(
@@ -270,10 +262,7 @@ public class JPaymentVoucher extends javax.swing.JPanel implements JPaymentInter
.addContainerGap() .addContainerGap()
.addComponent(jLabel5, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(jLabel5, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(m_jVoucher, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) .addComponent(m_jVoucher, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
.addGroup(jPanel4Layout.createSequentialGroup()
.addContainerGap()
.addComponent(jButton1)))
.addGap(0, 0, Short.MAX_VALUE)) .addGap(0, 0, Short.MAX_VALUE))
.addGroup(jPanel4Layout.createSequentialGroup() .addGroup(jPanel4Layout.createSequentialGroup()
.addContainerGap() .addContainerGap()
@@ -306,9 +295,7 @@ public class JPaymentVoucher extends javax.swing.JPanel implements JPaymentInter
.addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(webLblCustomer, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(webLblCustomer, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(webLblcustomerName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) .addComponent(webLblcustomerName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGap(33, 33, 33) .addGap(241, 241, 241))
.addComponent(jButton1)
.addContainerGap())
); );
add(jPanel4, java.awt.BorderLayout.CENTER); add(jPanel4, java.awt.BorderLayout.CENTER);
@@ -365,13 +352,8 @@ public class JPaymentVoucher extends javax.swing.JPanel implements JPaymentInter
} }
}//GEN-LAST:event_m_jVoucherActionPerformed }//GEN-LAST:event_m_jVoucherActionPerformed
private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed
}//GEN-LAST:event_jButton1ActionPerformed
// Variables declaration - do not modify//GEN-BEGIN:variables // Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JButton jButton1;
private javax.swing.JLabel jLabel1; private javax.swing.JLabel jLabel1;
private javax.swing.JLabel jLabel5; private javax.swing.JLabel jLabel5;
private javax.swing.JLabel jLabel6; private javax.swing.JLabel jLabel6;
@@ -383,9 +365,9 @@ public class JPaymentVoucher extends javax.swing.JPanel implements JPaymentInter
private javax.swing.JLabel m_jMoneyEuros; private javax.swing.JLabel m_jMoneyEuros;
private com.unicenta.editor.JEditorCurrencyPositive m_jTendered; private com.unicenta.editor.JEditorCurrencyPositive m_jTendered;
private javax.swing.JComboBox m_jVoucher; private javax.swing.JComboBox m_jVoucher;
private com.alee.laf.label.WebLabel voucherStatus; private javax.swing.JLabel voucherStatus;
private com.alee.laf.label.WebLabel webLblCustomer; private javax.swing.JLabel webLblCustomer;
private com.alee.laf.label.WebLabel webLblcustomerName; private javax.swing.JLabel webLblcustomerName;
// End of variables declaration//GEN-END:variables // End of variables declaration//GEN-END:variables
} }