unicenta-base/unicenta-opos
3
0
Fork 0
Code Issues 10 Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Compare commits

base: unicenta-base/unicenta-opos:5.4.0
Branches Tags
unicenta-base/unicenta-opos:main unicenta-base/unicenta-opos:5.5.0-development unicenta-base/unicenta-opos:debugging unicenta-base/unicenta-opos:UOCL-315-efr-attempt-2 unicenta-base/unicenta-opos:UOCL-315-efr unicenta-base/unicenta-opos:5.x-web unicenta-base/unicenta-opos:5.3.2 unicenta-base/unicenta-opos:java-17 unicenta-base/unicenta-opos:order-api unicenta-base/unicenta-opos:teya-integration unicenta-base/unicenta-opos:customer-api
unicenta-base/unicenta-opos:5.4.0-web unicenta-base/unicenta-opos:5.4.0 unicenta-base/unicenta-opos:5.3 unicenta-base/unicenta-opos:5.2 unicenta-base/unicenta-opos:5.0.1 unicenta-base/unicenta-opos:5.0
..
compare: unicenta-base/unicenta-opos:5.4.0-web
Branches Tags
unicenta-base/unicenta-opos:main unicenta-base/unicenta-opos:5.5.0-development unicenta-base/unicenta-opos:debugging unicenta-base/unicenta-opos:UOCL-315-efr-attempt-2 unicenta-base/unicenta-opos:UOCL-315-efr unicenta-base/unicenta-opos:5.x-web unicenta-base/unicenta-opos:5.3.2 unicenta-base/unicenta-opos:java-17 unicenta-base/unicenta-opos:order-api unicenta-base/unicenta-opos:teya-integration unicenta-base/unicenta-opos:customer-api
unicenta-base/unicenta-opos:5.4.0-web unicenta-base/unicenta-opos:5.4.0 unicenta-base/unicenta-opos:5.3 unicenta-base/unicenta-opos:5.2 unicenta-base/unicenta-opos:5.0.1 unicenta-base/unicenta-opos:5.0

9 Commits
5.4.0 .. 5.4.0-web

Author SHA1 Message Date
hugh 3e3076f2d5 5.4.0 web release java 8 requirements 2025-08-06 18:10:42 +01:00
hugh fa4edbe365 merge main 2025-08-06 17:39:16 +01:00
hugh 4a82f944b5 5.4.0 release for web / don't need derbyshared 2025-08-04 17:07:49 +01:00
hugh 73c3ed11b1 5.4.0 release for web 2025-08-04 16:57:31 +01:00
hugh 2036b92129 5.3.2 release 2025-05-06 15:34:19 +01:00
hugh d3f9fdb421 5.3.1 web release 2025-01-04 15:02:22 +00:00
hugh 256c8c4097 5.3.1 web release 2024-10-23 15:05:19 +01:00
hugh 7ef06723c4 5.3.1 web release 2024-09-07 13:56:23 +01:00
hugh 4a77297e23 starting 2024-08-24 11:34:51 +01:00
6 changed files with 170 additions and 115 deletions
Expand all files Collapse all files
pom.xml
+9 -9
View File
@@ -8,9 +8,9 @@
<packaging>jar</packaging> <packaging>jar</packaging>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>11</maven.compiler.source> <maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target> <maven.compiler.target>1.8</maven.compiler.target>
<derby.version>10.15.2.0</derby.version> <derby.version>10.14.2.0</derby.version>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
@@ -255,11 +255,11 @@
<artifactId>derbytools</artifactId> <artifactId>derbytools</artifactId>
<version>${derby.version}</version> <version>${derby.version}</version>
</dependency> </dependency>
<dependency> <!-- <dependency>-->
<groupId>org.apache.derby</groupId> <!-- <groupId>org.apache.derby</groupId>-->
<artifactId>derbyshared</artifactId> <!-- <artifactId>derbyshared</artifactId>-->
<version>${derby.version}</version> <!-- <version>${derby.version}</version>-->
</dependency> <!-- </dependency>-->
<dependency> <dependency>
<groupId>xml-apis</groupId> <groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId> <artifactId>xml-apis</artifactId>
@@ -361,7 +361,7 @@
<dependency> <dependency>
<groupId>com.unicenta</groupId> <groupId>com.unicenta</groupId>
<artifactId>unicenta-plugins</artifactId> <artifactId>unicenta-plugins</artifactId>
<version>1.3.0</version> <version>1.3.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.gluonhq</groupId> <groupId>com.gluonhq</groupId>
src/main/java/com/unicenta/pos/forms/JPrincipalApp.form
+10 -10
View File
@@ -21,7 +21,7 @@
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/> <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
<SubComponents> <SubComponents>
<Container class="javax.swing.JPanel" name="jPanel1"> <Container class="javax.swing.JPanel" name="mainMenuJPanel">
<Constraints> <Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription"> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
<BorderConstraints direction="Before"/> <BorderConstraints direction="Before"/>
@@ -73,7 +73,7 @@
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="1" attributes="0"> <Group type="102" alignment="1" attributes="0">
<EmptySpace min="0" pref="0" max="-2" attributes="0"/> <EmptySpace min="0" pref="0" max="-2" attributes="0"/>
<Component id="jButton1" min="-2" max="-2" attributes="0"/> <Component id="showMainMenuButton" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
</Group> </Group>
</Group> </Group>
@@ -81,15 +81,15 @@
<DimensionLayout dim="1"> <DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0"> <Group type="102" attributes="0">
<EmptySpace pref="88" max="32767" attributes="0"/> <EmptySpace max="32767" attributes="0"/>
<Component id="jButton1" pref="33" max="32767" attributes="0"/> <Component id="showMainMenuButton" pref="120" max="32767" attributes="0"/>
<EmptySpace pref="188" max="32767" attributes="0"/> <EmptySpace pref="95" max="32767" attributes="0"/>
</Group> </Group>
</Group> </Group>
</DimensionLayout> </DimensionLayout>
</Layout> </Layout>
<SubComponents> <SubComponents>
<Component class="javax.swing.JButton" name="jButton1"> <Component class="javax.swing.JButton" name="showMainMenuButton">
<Properties> <Properties>
<Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor"> <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="pos_messages.properties" key="tooltip.menu" replaceFormat="AppLocal.getIntString(&quot;tooltip.menu&quot;)"/> <ResourceString bundle="pos_messages.properties" key="tooltip.menu" replaceFormat="AppLocal.getIntString(&quot;tooltip.menu&quot;)"/>
@@ -112,14 +112,14 @@
<Property name="requestFocusEnabled" type="boolean" value="false"/> <Property name="requestFocusEnabled" type="boolean" value="false"/>
</Properties> </Properties>
<Events> <Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton1ActionPerformed"/> <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="showMainMenuButtonActionPerformed"/>
</Events> </Events>
</Component> </Component>
</SubComponents> </SubComponents>
</Container> </Container>
</SubComponents> </SubComponents>
</Container> </Container>
<Container class="javax.swing.JPanel" name="m_jPanelRight"> <Container class="javax.swing.JPanel" name="salesScreenJPanel">
<Properties> <Properties>
<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="[200, 40]"/> <Dimension value="[200, 40]"/>
@@ -133,7 +133,7 @@
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/> <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
<SubComponents> <SubComponents>
<Container class="javax.swing.JPanel" name="m_jPanelTitle"> <Container class="javax.swing.JPanel" name="salesScreenTitlePanel">
<Constraints> <Constraints>
<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription"> <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
<BorderConstraints direction="North"/> <BorderConstraints direction="North"/>
@@ -142,7 +142,7 @@
<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/> <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
<SubComponents> <SubComponents>
<Component class="javax.swing.JLabel" name="m_jTitle"> <Component class="javax.swing.JLabel" name="salesScreenTitleLabel">
<Properties> <Properties>
<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="14" style="1"/> <Font name="Arial" size="14" style="1"/>
src/main/java/com/unicenta/pos/forms/JPrincipalApp.java
+54 -59
View File
@@ -101,20 +101,16 @@ public class JPrincipalApp extends javax.swing.JPanel implements AppUserView {
m_principalnotificator.setText(m_appuser.getName()); m_principalnotificator.setText(m_appuser.getName());
m_principalnotificator.setIcon(m_appuser.getIcon()); m_principalnotificator.setIcon(m_appuser.getIcon());
if (jButton1.getComponentOrientation().isLeftToRight()) { if (showMainMenuButton.getComponentOrientation().isLeftToRight()) {
menu_open = new javax.swing.ImageIcon(getClass().getResource( menu_open = new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/menu-right.png"));
"/com/unicenta/images/menu-right.png")); menu_close = new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/menu-left.png"));
menu_close = new javax.swing.ImageIcon(getClass().getResource(
"/com/unicenta/images/menu-left.png"));
} else { } else {
menu_open = new javax.swing.ImageIcon(getClass().getResource( menu_open = new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/menu-left.png"));
"/com/unicenta/images/menu-left.png")); menu_close = new javax.swing.ImageIcon(getClass().getResource("/com/unicenta/images/menu-right.png"));
menu_close = new javax.swing.ImageIcon(getClass().getResource(
"/com/unicenta/images/menu-right.png"));
} }
assignMenuButtonIcon(); assignMenuButtonIcon();
m_jPanelTitle.setVisible(false); salesScreenTitlePanel.setVisible(false);
m_jPanelContainer.add(new JPanel(), "<NULL>"); m_jPanelContainer.add(new JPanel(), "<NULL>");
showView("<NULL>"); showView("<NULL>");
@@ -146,9 +142,7 @@ public class JPrincipalApp extends javax.swing.JPanel implements AppUserView {
} }
private void assignMenuButtonIcon() { private void assignMenuButtonIcon() {
jButton1.setIcon(m_jPanelLeft.isVisible() showMainMenuButton.setIcon(m_jPanelLeft.isVisible() ? menu_close : menu_open);
? menu_close
: menu_open);
} }
/** /**
@@ -490,12 +484,13 @@ public class JPrincipalApp extends javax.swing.JPanel implements AppUserView {
m_jLastView = m_jMyView; m_jLastView = m_jMyView;
setMenuVisible(getBounds().width > 800); setMenuVisible(getBounds().width > 800);
setMenuVisible(getBounds().height > 600);
setMenuVisible(false); setMenuVisible(false);
showView(sTaskClass); showView(sTaskClass);
String sTitle = m_jMyView.getTitle(); String sTitle = m_jMyView.getTitle();
m_jPanelTitle.setVisible(sTitle != null); salesScreenTitlePanel.setVisible(sTitle != null);
m_jTitle.setText(sTitle); salesScreenTitleLabel.setText(sTitle);
} }
} else { } else {
@@ -548,41 +543,41 @@ public class JPrincipalApp extends javax.swing.JPanel implements AppUserView {
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
private void initComponents() { private void initComponents() {
jPanel1 = new javax.swing.JPanel(); mainMenuJPanel = new javax.swing.JPanel();
m_jPanelLeft = new javax.swing.JScrollPane(); m_jPanelLeft = new javax.swing.JScrollPane();
jPanel2 = new javax.swing.JPanel(); jPanel2 = new javax.swing.JPanel();
jButton1 = new javax.swing.JButton(); showMainMenuButton = new javax.swing.JButton();
m_jPanelRight = new javax.swing.JPanel(); salesScreenJPanel = new javax.swing.JPanel();
m_jPanelTitle = new javax.swing.JPanel(); salesScreenTitlePanel = new javax.swing.JPanel();
m_jTitle = new javax.swing.JLabel(); salesScreenTitleLabel = new javax.swing.JLabel();
m_jPanelContainer = new javax.swing.JPanel(); m_jPanelContainer = new javax.swing.JPanel();
setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
setLayout(new java.awt.BorderLayout()); setLayout(new java.awt.BorderLayout());
jPanel1.setLayout(new java.awt.BorderLayout()); mainMenuJPanel.setLayout(new java.awt.BorderLayout());
m_jPanelLeft.setBackground(new java.awt.Color(102, 102, 102)); m_jPanelLeft.setBackground(new java.awt.Color(102, 102, 102));
m_jPanelLeft.setBorder(null); m_jPanelLeft.setBorder(null);
m_jPanelLeft.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N m_jPanelLeft.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
m_jPanelLeft.setPreferredSize(new java.awt.Dimension(250, 2)); m_jPanelLeft.setPreferredSize(new java.awt.Dimension(250, 2));
jPanel1.add(m_jPanelLeft, java.awt.BorderLayout.LINE_START); mainMenuJPanel.add(m_jPanelLeft, java.awt.BorderLayout.LINE_START);
jPanel2.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N jPanel2.setFont(new java.awt.Font("Arial", 0, 12)); // NOI18N
jPanel2.setPreferredSize(new java.awt.Dimension(45, 45)); jPanel2.setPreferredSize(new java.awt.Dimension(45, 45));
jButton1.setToolTipText(AppLocal.getIntString("tooltip.menu")); // NOI18N showMainMenuButton.setToolTipText(AppLocal.getIntString("tooltip.menu")); // NOI18N
jButton1.setFocusPainted(false); showMainMenuButton.setFocusPainted(false);
jButton1.setFocusable(false); showMainMenuButton.setFocusable(false);
jButton1.setIconTextGap(0); showMainMenuButton.setIconTextGap(0);
jButton1.setMargin(new java.awt.Insets(10, 2, 10, 2)); showMainMenuButton.setMargin(new java.awt.Insets(10, 2, 10, 2));
jButton1.setMaximumSize(new java.awt.Dimension(45, 32224661)); showMainMenuButton.setMaximumSize(new java.awt.Dimension(45, 32224661));
jButton1.setMinimumSize(new java.awt.Dimension(32, 32)); showMainMenuButton.setMinimumSize(new java.awt.Dimension(32, 32));
jButton1.setPreferredSize(new java.awt.Dimension(36, 45)); showMainMenuButton.setPreferredSize(new java.awt.Dimension(36, 45));
jButton1.setRequestFocusEnabled(false); showMainMenuButton.setRequestFocusEnabled(false);
jButton1.addActionListener(new java.awt.event.ActionListener() { showMainMenuButton.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) { public void actionPerformed(java.awt.event.ActionEvent evt) {
jButton1ActionPerformed(evt); showMainMenuButtonActionPerformed(evt);
} }
}); });
@@ -592,59 +587,59 @@ public class JPrincipalApp extends javax.swing.JPanel implements AppUserView {
jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel2Layout.createSequentialGroup() .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel2Layout.createSequentialGroup()
.addGap(0, 0, 0) .addGap(0, 0, 0)
.addComponent(jButton1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(showMainMenuButton, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addContainerGap()) .addContainerGap())
); );
jPanel2Layout.setVerticalGroup( jPanel2Layout.setVerticalGroup(
jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel2Layout.createSequentialGroup() .addGroup(jPanel2Layout.createSequentialGroup()
.addContainerGap(88, Short.MAX_VALUE) .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(jButton1, javax.swing.GroupLayout.DEFAULT_SIZE, 33, Short.MAX_VALUE) .addComponent(showMainMenuButton, javax.swing.GroupLayout.DEFAULT_SIZE, 120, Short.MAX_VALUE)
.addContainerGap(188, Short.MAX_VALUE)) .addContainerGap(95, Short.MAX_VALUE))
); );
jPanel1.add(jPanel2, java.awt.BorderLayout.LINE_END); mainMenuJPanel.add(jPanel2, java.awt.BorderLayout.LINE_END);
add(jPanel1, java.awt.BorderLayout.LINE_START); add(mainMenuJPanel, java.awt.BorderLayout.LINE_START);
m_jPanelRight.setPreferredSize(new java.awt.Dimension(200, 40)); salesScreenJPanel.setPreferredSize(new java.awt.Dimension(200, 40));
m_jPanelRight.setLayout(new java.awt.BorderLayout()); salesScreenJPanel.setLayout(new java.awt.BorderLayout());
m_jPanelTitle.setLayout(new java.awt.BorderLayout()); salesScreenTitlePanel.setLayout(new java.awt.BorderLayout());
m_jTitle.setFont(new java.awt.Font("Arial", 1, 14)); // NOI18N salesScreenTitleLabel.setFont(new java.awt.Font("Arial", 1, 14)); // NOI18N
m_jTitle.setForeground(new java.awt.Color(0, 168, 223)); salesScreenTitleLabel.setForeground(new java.awt.Color(0, 168, 223));
m_jTitle.setBorder(javax.swing.BorderFactory.createCompoundBorder(javax.swing.BorderFactory.createMatteBorder(0, 0, 1, 0, java.awt.Color.darkGray), javax.swing.BorderFactory.createEmptyBorder(10, 10, 10, 10))); salesScreenTitleLabel.setBorder(javax.swing.BorderFactory.createCompoundBorder(javax.swing.BorderFactory.createMatteBorder(0, 0, 1, 0, java.awt.Color.darkGray), javax.swing.BorderFactory.createEmptyBorder(10, 10, 10, 10)));
m_jTitle.setMaximumSize(new java.awt.Dimension(100, 35)); salesScreenTitleLabel.setMaximumSize(new java.awt.Dimension(100, 35));
m_jTitle.setMinimumSize(new java.awt.Dimension(30, 25)); salesScreenTitleLabel.setMinimumSize(new java.awt.Dimension(30, 25));
m_jTitle.setPreferredSize(new java.awt.Dimension(100, 35)); salesScreenTitleLabel.setPreferredSize(new java.awt.Dimension(100, 35));
m_jPanelTitle.add(m_jTitle, java.awt.BorderLayout.NORTH); salesScreenTitlePanel.add(salesScreenTitleLabel, java.awt.BorderLayout.NORTH);
m_jPanelRight.add(m_jPanelTitle, java.awt.BorderLayout.NORTH); salesScreenJPanel.add(salesScreenTitlePanel, java.awt.BorderLayout.NORTH);
m_jPanelContainer.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N m_jPanelContainer.setFont(new java.awt.Font("Arial", 0, 14)); // NOI18N
m_jPanelContainer.setLayout(new java.awt.CardLayout()); m_jPanelContainer.setLayout(new java.awt.CardLayout());
m_jPanelRight.add(m_jPanelContainer, java.awt.BorderLayout.CENTER); salesScreenJPanel.add(m_jPanelContainer, BorderLayout.CENTER);
add(m_jPanelRight, java.awt.BorderLayout.CENTER); add(salesScreenJPanel, java.awt.BorderLayout.CENTER);
}// </editor-fold>//GEN-END:initComponents }// </editor-fold>//GEN-END:initComponents
private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed private void showMainMenuButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_showMainMenuButtonActionPerformed
setMenuVisible(!m_jPanelLeft.isVisible()); setMenuVisible(!m_jPanelLeft.isVisible());
}//GEN-LAST:event_jButton1ActionPerformed }//GEN-LAST:event_showMainMenuButtonActionPerformed
// Variables declaration - do not modify//GEN-BEGIN:variables // Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JButton jButton1;
private javax.swing.JPanel jPanel1;
private javax.swing.JPanel jPanel2; private javax.swing.JPanel jPanel2;
private javax.swing.JPanel m_jPanelContainer; private javax.swing.JPanel m_jPanelContainer;
private javax.swing.JScrollPane m_jPanelLeft; private javax.swing.JScrollPane m_jPanelLeft;
private javax.swing.JPanel m_jPanelRight; private javax.swing.JPanel mainMenuJPanel;
private javax.swing.JPanel m_jPanelTitle; private javax.swing.JPanel salesScreenJPanel;
private javax.swing.JLabel m_jTitle; private javax.swing.JLabel salesScreenTitleLabel;
private javax.swing.JPanel salesScreenTitlePanel;
private javax.swing.JButton showMainMenuButton;
// End of variables declaration//GEN-END:variables // End of variables declaration//GEN-END:variables
} }
src/main/java/com/unicenta/pos/forms/JRootApp.java
+1 -1
View File
@@ -1021,7 +1021,7 @@ public class JRootApp extends JPanel implements AppView, DeviceMonitorEventListe
jLabel2.setPreferredSize(new java.awt.Dimension(180, 34)); jLabel2.setPreferredSize(new java.awt.Dimension(180, 34));
m_jPanelTitle.add(jLabel2, java.awt.BorderLayout.LINE_START); m_jPanelTitle.add(jLabel2, java.awt.BorderLayout.LINE_START);
add(m_jPanelTitle, java.awt.BorderLayout.NORTH); //add(m_jPanelTitle, java.awt.BorderLayout.NORTH);
m_jPanelContainer.setLayout(new java.awt.CardLayout()); m_jPanelContainer.setLayout(new java.awt.CardLayout());
src/main/java/com/unicenta/pos/sales/shared/JTicketsBagShared.java
+1 -1
View File
@@ -82,7 +82,7 @@ public class JTicketsBagShared extends JTicketsBag {
log.debug("Loading Sales screen! "+this.getClass()); log.debug("Loading Sales screen! "+this.getClass());
ExecutorService customExecutor = Executors.newCachedThreadPool(); ExecutorService customExecutor = Executors.newCachedThreadPool();
SwingWorker<String, String> reloadLayaway = new SwingWorker<String, String>() { SwingWorker<String, String> reloadLayaway = new SwingWorker() {
@Override @Override
protected String doInBackground() throws Exception { protected String doInBackground() throws Exception {
while (true) { while (true) {
src/main/resources/com/unicenta/pos/scripts/MySQL-upgrade_master.sql
+61 -1
View File
@@ -1,2 +1,62 @@
UPDATE applications SET version = $APP_VERSION{} WHERE id = $APP_ID{}; -- CLEAR THE DECKS
DELETE FROM sharedtickets;
-- Switch OFF table foreign key relationships
set foreign_key_checks = 0;
-- RECREATE applications table
DROP TABLE `applications`;
CREATE TABLE IF NOT EXISTS `applications` (
`id` varchar(255) NOT NULL,
`name` varchar(255) NOT NULL,
`version` varchar(255) NOT NULL,
`instdate` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
PRIMARY KEY ( `id` )
) ENGINE = InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT = Compact;
-- SYSTEM
DELETE FROM resources WHERE name = 'script.posapps';
DELETE FROM resources WHERE id = '0';
DELETE FROM resources WHERE id = '00';
INSERT INTO resources(id, name, restype, content) VALUES('00', 'Menu.Root', 0, $FILE{/com/unicenta/pos/templates/Menu.Root.txt});
UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/Ticket.Buttons.xml} WHERE name = 'Ticket.Buttons';
COMMIT;
UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/Printer.Ticket.xml} WHERE name = 'Printer.Ticket';
COMMIT;
UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/Ticket.Close.xml} WHERE name = 'Ticket.Close';
COMMIT;
UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/Cash.Close.xml} WHERE name = 'Cash.Close';
COMMIT;
UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/customer.created.xml} WHERE name = 'Customer.Created';
COMMIT;
UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/customer.deleted.xml} WHERE name = 'Customer.Deleted';
COMMIT;
UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/customer.updated.xml} WHERE name = 'Customer.Updated';
COMMIT;
-- ROLES
DELETE FROM roles WHERE id = '0';
INSERT INTO roles(id, name, permissions) VALUES('0', 'Administrator role', $FILE{/com/unicenta/pos/templates/Role.Administrator.xml} );
DELETE FROM roles WHERE id = '1';
INSERT INTO roles(id, name, permissions) VALUES('1', 'Manager role', $FILE{/com/unicenta/pos/templates/Role.Manager.xml} );
DELETE FROM roles WHERE id = '2';
INSERT INTO roles(id, name, permissions) VALUES('2', 'Employee role', $FILE{/com/unicenta/pos/templates/Role.Employee.xml} );
-- Switch ON table foreign key relationships
set foreign_key_checks = 1;
INSERT INTO applications(id, name, version) VALUES($APP_ID{}, $APP_NAME{}, '5.3.1');
COMMIT; COMMIT;