Skip to content

Commit fc4f3d7

Browse files
poolborgespoolborges
committed
App: Close cash, reorder button
* added tranlatable string
1 parent d5681c8 commit fc4f3d7

File tree

3 files changed

+47
-46
lines changed

3 files changed

+47
-46
lines changed

‎kriolos-opos-app/src/main/java/com/openbravo/pos/panels/JPanelCloseMoney.form

+8-8
Original file line numberDiff line numberDiff line change
@@ -543,7 +543,7 @@
543543
</Constraint>
544544
</Constraints>
545545
</Component>
546-
<Component class="javax.swing.JButton" name="m_jPrintCash">
546+
<Component class="javax.swing.JButton" name="m_jPrintCashPreview">
547547
<Properties>
548548
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
549549
<Font name="Arial" size="12" style="0"/>
@@ -570,7 +570,7 @@
570570
</Property>
571571
</Properties>
572572
<Events>
573-
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="m_jPrintCashActionPerformed"/>
573+
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="m_jPrintCashPreviewActionPerformed"/>
574574
</Events>
575575
<Constraints>
576576
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
@@ -587,7 +587,7 @@
587587
<Image iconType="3" name="/com/openbravo/images/printer.png"/>
588588
</Property>
589589
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
590-
<ResourceString bundle="pos_messages.properties" key="cboption.reprint" replaceFormat="AppLocal.getIntString(&quot;{key}&quot;)"/>
590+
<ResourceString bundle="pos_messages.properties" key="button.printcash" replaceFormat="AppLocal.getIntString(&quot;{key}&quot;)"/>
591591
</Property>
592592
<Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
593593
<ResourceString bundle="pos_messages.properties" key="cboption.reprint" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
@@ -609,11 +609,11 @@
609609
</Events>
610610
<Constraints>
611611
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
612-
<AbsoluteConstraints x="530" y="450" width="-1" height="-1"/>
612+
<AbsoluteConstraints x="10" y="450" width="-1" height="-1"/>
613613
</Constraint>
614614
</Constraints>
615615
</Component>
616-
<Component class="javax.swing.JButton" name="m_jPrintCash2">
616+
<Component class="javax.swing.JButton" name="m_jReprintCash">
617617
<Properties>
618618
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
619619
<Font name="Arial" size="12" style="0"/>
@@ -622,7 +622,7 @@
622622
<Image iconType="3" name="/com/openbravo/images/printer.png"/>
623623
</Property>
624624
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
625-
<ResourceString bundle="pos_messages.properties" key="button.printcash" replaceFormat="AppLocal.getIntString(&quot;{key}&quot;)"/>
625+
<ResourceString bundle="pos_messages.properties" key="cboption.reprint" replaceFormat="AppLocal.getIntString(&quot;{key}&quot;)"/>
626626
</Property>
627627
<Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
628628
<ResourceString bundle="pos_messages.properties" key="tooltip.btn.partialcash" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
@@ -640,11 +640,11 @@
640640
</Property>
641641
</Properties>
642642
<Events>
643-
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="m_jPrintCash2ActionPerformed"/>
643+
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="m_jReprintCashActionPerformed"/>
644644
</Events>
645645
<Constraints>
646646
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
647-
<AbsoluteConstraints x="10" y="450" width="-1" height="-1"/>
647+
<AbsoluteConstraints x="530" y="450" width="-1" height="-1"/>
648648
</Constraint>
649649
</Constraints>
650650
</Component>

‎kriolos-opos-app/src/main/java/com/openbravo/pos/panels/JPanelCloseMoney.java

+37-37
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ private void loadData() throws BasicException {
170170
m_jSequence.setText(null);
171171
m_jMinDate.setText(null);
172172
m_jMaxDate.setText(null);
173-
m_jPrintCash.setEnabled(false);
173+
m_jPrintCashPreview.setEnabled(false);
174174
m_jCloseCash.setEnabled(false);
175175

176176

@@ -196,7 +196,7 @@ private void loadData() throws BasicException {
196196
if (m_PaymentsToClose.getPayments() != 0
197197
|| m_PaymentsToClose.getSales() != 0) {
198198

199-
m_jPrintCash.setEnabled(true);
199+
m_jPrintCashPreview.setEnabled(true);
200200
m_jCloseCash.setEnabled(true);
201201

202202

@@ -433,9 +433,9 @@ private void initComponents() {
433433
m_jSalesSubtotal = new javax.swing.JTextField();
434434
jLabel6 = new javax.swing.JLabel();
435435
m_jCloseCash = new javax.swing.JButton();
436-
m_jPrintCash = new javax.swing.JButton();
436+
m_jPrintCashPreview = new javax.swing.JButton();
437437
m_jPrintCash1 = new javax.swing.JButton();
438-
m_jPrintCash2 = new javax.swing.JButton();
438+
m_jReprintCash = new javax.swing.JButton();
439439

440440
setLayout(new java.awt.BorderLayout());
441441

@@ -621,25 +621,25 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
621621
});
622622
jPanel1.add(m_jCloseCash, new org.netbeans.lib.awtextra.AbsoluteConstraints(170, 450, -1, -1));
623623

624-
m_jPrintCash.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
625-
m_jPrintCash.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/openbravo/images/printer.png"))); // NOI18N
626-
m_jPrintCash.setText(AppLocal.getIntString("cboption.preview")); // NOI18N
627-
m_jPrintCash.setToolTipText(AppLocal.getIntString("cboption.preview")); // NOI18N
628-
m_jPrintCash.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
629-
m_jPrintCash.setIconTextGap(2);
630-
m_jPrintCash.setMaximumSize(new java.awt.Dimension(85, 33));
631-
m_jPrintCash.setMinimumSize(new java.awt.Dimension(85, 33));
632-
m_jPrintCash.setPreferredSize(new java.awt.Dimension(150, 45));
633-
m_jPrintCash.addActionListener(new java.awt.event.ActionListener() {
624+
m_jPrintCashPreview.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
625+
m_jPrintCashPreview.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/openbravo/images/printer.png"))); // NOI18N
626+
m_jPrintCashPreview.setText(AppLocal.getIntString("cboption.preview")); // NOI18N
627+
m_jPrintCashPreview.setToolTipText(AppLocal.getIntString("cboption.preview")); // NOI18N
628+
m_jPrintCashPreview.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
629+
m_jPrintCashPreview.setIconTextGap(2);
630+
m_jPrintCashPreview.setMaximumSize(new java.awt.Dimension(85, 33));
631+
m_jPrintCashPreview.setMinimumSize(new java.awt.Dimension(85, 33));
632+
m_jPrintCashPreview.setPreferredSize(new java.awt.Dimension(150, 45));
633+
m_jPrintCashPreview.addActionListener(new java.awt.event.ActionListener() {
634634
public void actionPerformed(java.awt.event.ActionEvent evt) {
635-
m_jPrintCashActionPerformed(evt);
635+
m_jPrintCashPreviewActionPerformed(evt);
636636
}
637637
});
638-
jPanel1.add(m_jPrintCash, new org.netbeans.lib.awtextra.AbsoluteConstraints(370, 450, -1, -1));
638+
jPanel1.add(m_jPrintCashPreview, new org.netbeans.lib.awtextra.AbsoluteConstraints(370, 450, -1, -1));
639639

640640
m_jPrintCash1.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
641641
m_jPrintCash1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/openbravo/images/printer.png"))); // NOI18N
642-
m_jPrintCash1.setText(AppLocal.getIntString("cboption.reprint")); // NOI18N
642+
m_jPrintCash1.setText(AppLocal.getIntString("button.printcash")); // NOI18N
643643
m_jPrintCash1.setToolTipText(bundle.getString("cboption.reprint")); // NOI18N
644644
m_jPrintCash1.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
645645
m_jPrintCash1.setIconTextGap(2);
@@ -651,23 +651,23 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
651651
m_jPrintCash1ActionPerformed(evt);
652652
}
653653
});
654-
jPanel1.add(m_jPrintCash1, new org.netbeans.lib.awtextra.AbsoluteConstraints(530, 450, -1, -1));
655-
656-
m_jPrintCash2.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
657-
m_jPrintCash2.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/openbravo/images/printer.png"))); // NOI18N
658-
m_jPrintCash2.setText(AppLocal.getIntString("button.printcash")); // NOI18N
659-
m_jPrintCash2.setToolTipText(bundle.getString("tooltip.btn.partialcash")); // NOI18N
660-
m_jPrintCash2.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
661-
m_jPrintCash2.setIconTextGap(2);
662-
m_jPrintCash2.setMaximumSize(new java.awt.Dimension(85, 33));
663-
m_jPrintCash2.setMinimumSize(new java.awt.Dimension(85, 33));
664-
m_jPrintCash2.setPreferredSize(new java.awt.Dimension(150, 45));
665-
m_jPrintCash2.addActionListener(new java.awt.event.ActionListener() {
654+
jPanel1.add(m_jPrintCash1, new org.netbeans.lib.awtextra.AbsoluteConstraints(10, 450, -1, -1));
655+
656+
m_jReprintCash.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
657+
m_jReprintCash.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/openbravo/images/printer.png"))); // NOI18N
658+
m_jReprintCash.setText(AppLocal.getIntString("cboption.reprint")); // NOI18N
659+
m_jReprintCash.setToolTipText(bundle.getString("tooltip.btn.partialcash")); // NOI18N
660+
m_jReprintCash.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
661+
m_jReprintCash.setIconTextGap(2);
662+
m_jReprintCash.setMaximumSize(new java.awt.Dimension(85, 33));
663+
m_jReprintCash.setMinimumSize(new java.awt.Dimension(85, 33));
664+
m_jReprintCash.setPreferredSize(new java.awt.Dimension(150, 45));
665+
m_jReprintCash.addActionListener(new java.awt.event.ActionListener() {
666666
public void actionPerformed(java.awt.event.ActionEvent evt) {
667-
m_jPrintCash2ActionPerformed(evt);
667+
m_jReprintCashActionPerformed(evt);
668668
}
669669
});
670-
jPanel1.add(m_jPrintCash2, new org.netbeans.lib.awtextra.AbsoluteConstraints(10, 450, -1, -1));
670+
jPanel1.add(m_jReprintCash, new org.netbeans.lib.awtextra.AbsoluteConstraints(530, 450, -1, -1));
671671

672672
add(jPanel1, java.awt.BorderLayout.CENTER);
673673
}// </editor-fold>//GEN-END:initComponents
@@ -759,19 +759,19 @@ private void m_jCloseCashActionPerformed(java.awt.event.ActionEvent evt) {//GEN-
759759
}
760760
}//GEN-LAST:event_m_jCloseCashActionPerformed
761761

762-
private void m_jPrintCashActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_m_jPrintCashActionPerformed
762+
private void m_jPrintCashPreviewActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_m_jPrintCashPreviewActionPerformed
763763

764764
printPayments("Printer.PartialCash");
765765

766-
}//GEN-LAST:event_m_jPrintCashActionPerformed
766+
}//GEN-LAST:event_m_jPrintCashPreviewActionPerformed
767767

768768
private void m_jPrintCash1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_m_jPrintCash1ActionPerformed
769769
printPayments("Printer.CloseCash.Preview");
770770
}//GEN-LAST:event_m_jPrintCash1ActionPerformed
771771

772-
private void m_jPrintCash2ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_m_jPrintCash2ActionPerformed
772+
private void m_jReprintCashActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_m_jReprintCashActionPerformed
773773
m_App.getAppUserView().showTask("com.openbravo.pos.panels.JPanelCloseMoneyReprint");
774-
}//GEN-LAST:event_m_jPrintCash2ActionPerformed
774+
}//GEN-LAST:event_m_jReprintCashActionPerformed
775775

776776

777777
// Variables declaration - do not modify//GEN-BEGIN:variables
@@ -795,9 +795,9 @@ private void m_jPrintCash2ActionPerformed(java.awt.event.ActionEvent evt) {//GEN
795795
private javax.swing.JTextField m_jMaxDate;
796796
private javax.swing.JTextField m_jMinDate;
797797
private javax.swing.JTextField m_jNoCashSales;
798-
private javax.swing.JButton m_jPrintCash;
799798
private javax.swing.JButton m_jPrintCash1;
800-
private javax.swing.JButton m_jPrintCash2;
799+
private javax.swing.JButton m_jPrintCashPreview;
800+
private javax.swing.JButton m_jReprintCash;
801801
private javax.swing.JTextField m_jSales;
802802
private javax.swing.JTextField m_jSalesSubtotal;
803803
private javax.swing.JTextField m_jSalesTaxes;

‎kriolos-opos-app/src/main/resources/pos_messages.properties

+2-1
Original file line numberDiff line numberDiff line change
@@ -1166,4 +1166,5 @@ jpaymentselect.printer.off=Printer Off
11661166
jpaymentselect.payment.addpartial=Add Part Payment
11671167
jpaymentselect.payment.delpartial=Delete Part Payment
11681168

1169-
customerspayment.prepay.empty="Prepay amount is empty
1169+
customerspayment.prepay.empty="Prepay amount is empty
1170+
cboption.reprint\ =Print

0 commit comments

Comments
 (0)