Skip to content

Commit c3d10a4

Browse files
poolborgespoolborges
committed
App: Done breaking changes, Payment related stuff
1 parent ed67217 commit c3d10a4

15 files changed

+735
-654
lines changed

‎kriolos-opos-app/src/main/java/com/openbravo/pos/customers/CustomersPayment.form

+24-29
Original file line numberDiff line numberDiff line change
@@ -266,40 +266,35 @@
266266
<DimensionLayout dim="0">
267267
<Group type="103" groupAlignment="0" attributes="0">
268268
<Group type="102" attributes="0">
269+
<EmptySpace max="-2" attributes="0"/>
269270
<Group type="103" groupAlignment="0" attributes="0">
270-
<Group type="102" attributes="0">
271-
<EmptySpace max="-2" attributes="0"/>
271+
<Group type="102" alignment="0" attributes="0">
272+
<Component id="jLabel3" min="-2" pref="140" max="-2" attributes="0"/>
273+
<EmptySpace type="unrelated" max="-2" attributes="0"/>
274+
<Component id="txtName" min="-2" pref="240" max="-2" attributes="0"/>
275+
</Group>
276+
<Group type="102" alignment="0" attributes="0">
277+
<Component id="jLabel5" min="-2" pref="140" max="-2" attributes="0"/>
278+
<EmptySpace type="unrelated" max="-2" attributes="0"/>
279+
<Component id="txtCard" min="-2" pref="240" max="-2" attributes="0"/>
280+
</Group>
281+
<Group type="102" alignment="0" attributes="0">
282+
<Component id="jLabel7" min="-2" pref="140" max="-2" attributes="0"/>
283+
<EmptySpace type="unrelated" max="-2" attributes="0"/>
284+
<Component id="txtTaxId" min="-2" pref="240" max="-2" attributes="0"/>
285+
</Group>
286+
<Group type="102" alignment="0" attributes="0">
272287
<Group type="103" groupAlignment="0" attributes="0">
273-
<Group type="102" alignment="0" attributes="0">
274-
<Component id="jLabel3" min="-2" pref="140" max="-2" attributes="0"/>
275-
<EmptySpace type="unrelated" max="-2" attributes="0"/>
276-
<Component id="txtName" min="-2" pref="240" max="-2" attributes="0"/>
277-
</Group>
278-
<Group type="102" alignment="0" attributes="0">
279-
<Component id="jLabel5" min="-2" pref="140" max="-2" attributes="0"/>
280-
<EmptySpace type="unrelated" max="-2" attributes="0"/>
281-
<Component id="txtCard" min="-2" pref="240" max="-2" attributes="0"/>
282-
</Group>
283-
<Group type="102" alignment="0" attributes="0">
284-
<Component id="jLabel7" min="-2" pref="140" max="-2" attributes="0"/>
285-
<EmptySpace type="unrelated" max="-2" attributes="0"/>
286-
<Component id="txtTaxId" min="-2" pref="240" max="-2" attributes="0"/>
287-
</Group>
288-
<Group type="102" alignment="0" attributes="0">
289-
<Group type="103" groupAlignment="0" attributes="0">
290-
<Component id="jLabel12" alignment="0" min="-2" pref="140" max="-2" attributes="0"/>
291-
<Component id="lblPrePay" alignment="0" min="-2" max="-2" attributes="0"/>
292-
</Group>
293-
<EmptySpace type="unrelated" max="-2" attributes="0"/>
294-
<Group type="103" groupAlignment="0" max="-2" attributes="0">
295-
<Component id="txtNotes" max="32767" attributes="0"/>
296-
<Component id="txtPrePay" max="32767" attributes="0"/>
297-
</Group>
298-
</Group>
288+
<Component id="jLabel12" alignment="0" min="-2" pref="140" max="-2" attributes="0"/>
289+
<Component id="lblPrePay" alignment="0" min="-2" max="-2" attributes="0"/>
290+
</Group>
291+
<EmptySpace type="unrelated" max="-2" attributes="0"/>
292+
<Group type="103" groupAlignment="0" max="-2" attributes="0">
293+
<Component id="txtNotes" max="32767" attributes="0"/>
294+
<Component id="txtPrePay" max="32767" attributes="0"/>
299295
</Group>
300296
</Group>
301297
<Group type="102" alignment="0" attributes="0">
302-
<EmptySpace max="-2" attributes="0"/>
303298
<Group type="103" groupAlignment="0" attributes="0">
304299
<Group type="102" alignment="0" attributes="0">
305300
<Component id="txtMaxdebt" min="-2" max="-2" attributes="0"/>

‎kriolos-opos-app/src/main/java/com/openbravo/pos/customers/CustomersPayment.java

+19-22
Original file line numberDiff line numberDiff line change
@@ -501,32 +501,29 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
501501
jPanel1Layout.setHorizontalGroup(
502502
jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
503503
.addGroup(jPanel1Layout.createSequentialGroup()
504+
.addContainerGap()
504505
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
505506
.addGroup(jPanel1Layout.createSequentialGroup()
506-
.addContainerGap()
507+
.addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, 140, javax.swing.GroupLayout.PREFERRED_SIZE)
508+
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
509+
.addComponent(txtName, javax.swing.GroupLayout.PREFERRED_SIZE, 240, javax.swing.GroupLayout.PREFERRED_SIZE))
510+
.addGroup(jPanel1Layout.createSequentialGroup()
511+
.addComponent(jLabel5, javax.swing.GroupLayout.PREFERRED_SIZE, 140, javax.swing.GroupLayout.PREFERRED_SIZE)
512+
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
513+
.addComponent(txtCard, javax.swing.GroupLayout.PREFERRED_SIZE, 240, javax.swing.GroupLayout.PREFERRED_SIZE))
514+
.addGroup(jPanel1Layout.createSequentialGroup()
515+
.addComponent(jLabel7, javax.swing.GroupLayout.PREFERRED_SIZE, 140, javax.swing.GroupLayout.PREFERRED_SIZE)
516+
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
517+
.addComponent(txtTaxId, javax.swing.GroupLayout.PREFERRED_SIZE, 240, javax.swing.GroupLayout.PREFERRED_SIZE))
518+
.addGroup(jPanel1Layout.createSequentialGroup()
507519
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
508-
.addGroup(jPanel1Layout.createSequentialGroup()
509-
.addComponent(jLabel3, javax.swing.GroupLayout.PREFERRED_SIZE, 140, javax.swing.GroupLayout.PREFERRED_SIZE)
510-
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
511-
.addComponent(txtName, javax.swing.GroupLayout.PREFERRED_SIZE, 240, javax.swing.GroupLayout.PREFERRED_SIZE))
512-
.addGroup(jPanel1Layout.createSequentialGroup()
513-
.addComponent(jLabel5, javax.swing.GroupLayout.PREFERRED_SIZE, 140, javax.swing.GroupLayout.PREFERRED_SIZE)
514-
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
515-
.addComponent(txtCard, javax.swing.GroupLayout.PREFERRED_SIZE, 240, javax.swing.GroupLayout.PREFERRED_SIZE))
516-
.addGroup(jPanel1Layout.createSequentialGroup()
517-
.addComponent(jLabel7, javax.swing.GroupLayout.PREFERRED_SIZE, 140, javax.swing.GroupLayout.PREFERRED_SIZE)
518-
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
519-
.addComponent(txtTaxId, javax.swing.GroupLayout.PREFERRED_SIZE, 240, javax.swing.GroupLayout.PREFERRED_SIZE))
520-
.addGroup(jPanel1Layout.createSequentialGroup()
521-
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
522-
.addComponent(jLabel12, javax.swing.GroupLayout.PREFERRED_SIZE, 140, javax.swing.GroupLayout.PREFERRED_SIZE)
523-
.addComponent(lblPrePay, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
524-
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
525-
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
526-
.addComponent(txtNotes, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
527-
.addComponent(txtPrePay, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))))
520+
.addComponent(jLabel12, javax.swing.GroupLayout.PREFERRED_SIZE, 140, javax.swing.GroupLayout.PREFERRED_SIZE)
521+
.addComponent(lblPrePay, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
522+
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
523+
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
524+
.addComponent(txtNotes, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
525+
.addComponent(txtPrePay, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
528526
.addGroup(jPanel1Layout.createSequentialGroup()
529-
.addContainerGap()
530527
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
531528
.addGroup(jPanel1Layout.createSequentialGroup()
532529
.addComponent(txtMaxdebt, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)

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

+56-15
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,6 @@
291291
<Dimension value="[0, 1]"/>
292292
</Property>
293293
<Property name="requestFocusEnabled" type="boolean" value="false"/>
294-
<Property name="showVerticalLines" type="boolean" value="false"/>
295294
</Properties>
296295
</Component>
297296
</SubComponents>
@@ -452,7 +451,6 @@
452451
<Dimension value="[0, 1]"/>
453452
</Property>
454453
<Property name="requestFocusEnabled" type="boolean" value="false"/>
455-
<Property name="showVerticalLines" type="boolean" value="false"/>
456454
</Properties>
457455
</Component>
458456
</SubComponents>
@@ -554,10 +552,10 @@
554552
<Image iconType="3" name="/com/openbravo/images/printer.png"/>
555553
</Property>
556554
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
557-
<ResourceString bundle="pos_messages.properties" key="button.printcash" replaceFormat="AppLocal.getIntString(&quot;{key}&quot;)"/>
555+
<ResourceString bundle="pos_messages.properties" key="cboption.preview" replaceFormat="AppLocal.getIntString(&quot;{key}&quot;)"/>
558556
</Property>
559557
<Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
560-
<ResourceString bundle="pos_messages.properties" key="tooltip.btn.partialcash" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
558+
<ResourceString bundle="pos_messages.properties" key="cboption.preview" replaceFormat="AppLocal.getIntString(&quot;{key}&quot;)"/>
561559
</Property>
562560
<Property name="horizontalAlignment" type="int" value="2"/>
563561
<Property name="iconTextGap" type="int" value="2"/>
@@ -576,34 +574,77 @@
576574
</Events>
577575
<Constraints>
578576
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
579-
<AbsoluteConstraints x="10" y="450" width="-1" height="-1"/>
577+
<AbsoluteConstraints x="370" y="450" width="-1" height="-1"/>
580578
</Constraint>
581579
</Constraints>
582580
</Component>
583-
<Component class="javax.swing.JComboBox" name="jCBCloseCash">
581+
<Component class="javax.swing.JButton" name="m_jPrintCash1">
584582
<Properties>
585583
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
586-
<Font name="Arial" size="14" style="0"/>
584+
<Font name="Arial" size="12" style="0"/>
587585
</Property>
588-
<Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
589-
<StringArray count="0"/>
586+
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
587+
<Image iconType="3" name="/com/openbravo/images/printer.png"/>
588+
</Property>
589+
<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;)"/>
590591
</Property>
591592
<Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
592-
<ResourceString bundle="pos_messages.properties" key="tooltip.closecashactions" replaceFormat="AppLocal.getIntString(&quot;tooltip.closecashactions&quot;)"/>
593+
<ResourceString bundle="pos_messages.properties" key="cboption.reprint" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
594+
</Property>
595+
<Property name="horizontalAlignment" type="int" value="2"/>
596+
<Property name="iconTextGap" type="int" value="2"/>
597+
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
598+
<Dimension value="[85, 33]"/>
599+
</Property>
600+
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
601+
<Dimension value="[85, 33]"/>
593602
</Property>
594603
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
595604
<Dimension value="[150, 45]"/>
596605
</Property>
597606
</Properties>
598607
<Events>
599-
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jCBCloseCashActionPerformed"/>
608+
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="m_jPrintCash1ActionPerformed"/>
609+
</Events>
610+
<Constraints>
611+
<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"/>
613+
</Constraint>
614+
</Constraints>
615+
</Component>
616+
<Component class="javax.swing.JButton" name="m_jPrintCash2">
617+
<Properties>
618+
<Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
619+
<Font name="Arial" size="12" style="0"/>
620+
</Property>
621+
<Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
622+
<Image iconType="3" name="/com/openbravo/images/printer.png"/>
623+
</Property>
624+
<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;)"/>
626+
</Property>
627+
<Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
628+
<ResourceString bundle="pos_messages.properties" key="tooltip.btn.partialcash" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
629+
</Property>
630+
<Property name="horizontalAlignment" type="int" value="2"/>
631+
<Property name="iconTextGap" type="int" value="2"/>
632+
<Property name="maximumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
633+
<Dimension value="[85, 33]"/>
634+
</Property>
635+
<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
636+
<Dimension value="[85, 33]"/>
637+
</Property>
638+
<Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
639+
<Dimension value="[150, 45]"/>
640+
</Property>
641+
</Properties>
642+
<Events>
643+
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="m_jPrintCash2ActionPerformed"/>
600644
</Events>
601-
<AuxValues>
602-
<AuxValue name="JavaCodeGenerator_TypeParameters" type="java.lang.String" value="&lt;String&gt;"/>
603-
</AuxValues>
604645
<Constraints>
605646
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
606-
<AbsoluteConstraints x="510" y="450" width="-1" height="-1"/>
647+
<AbsoluteConstraints x="10" y="450" width="-1" height="-1"/>
607648
</Constraint>
608649
</Constraints>
609650
</Component>

0 commit comments

Comments
 (0)