Compare commits
37 Commits
customer-api
...
5.3
| Author | SHA1 | Date | |
|---|---|---|---|
| a3e297fa61 | |||
| f0c670fd67 | |||
| a23631be46 | |||
| a86418b16d | |||
| 763c06f0c9 | |||
| 1b34fdabb0 | |||
| cab75818b7 | |||
| 5864c6373a | |||
| 0d6b0192d8 | |||
| bedf5b60ad | |||
| 3b0eccae9c | |||
| b8f22b9ae2 | |||
| cefebc3882 | |||
| bfaeedfa34 | |||
| 492990848b | |||
| 3637f8a352 | |||
| 160cd189c8 | |||
| 33c4c39082 | |||
| f5930ee93d | |||
| 83b5c421c2 | |||
| 5fed36a86c | |||
| 6f026636eb | |||
| 9095f02baf | |||
| e81ef4244a | |||
| bdeb625570 | |||
| d40880a7c2 | |||
| e136c11f27 | |||
| c8855c2a57 | |||
| 817168fc88 | |||
| 27ac3f6bb5 | |||
| d1fc482eb5 | |||
| 84c4b2b0b2 | |||
| e9fff7f4a3 | |||
| b7bef162df | |||
| 5b81989f2f | |||
| 90114551ff | |||
| 7a084e37a0 |
@@ -0,0 +1,18 @@
|
|||||||
|
name: Java CI with Maven
|
||||||
|
|
||||||
|
on: [workflow_dispatch]
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
- name: Set up JDK 11
|
||||||
|
uses: actions/setup-java@v3
|
||||||
|
with:
|
||||||
|
java-version: '11'
|
||||||
|
distribution: 'adopt'
|
||||||
|
cache: maven
|
||||||
|
- name: Build with Maven
|
||||||
|
run: mvn -B package --file pom.xml
|
||||||
@@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
<groupId>com.unicenta</groupId>
|
<groupId>com.unicenta</groupId>
|
||||||
<artifactId>unicentaopos</artifactId>
|
<artifactId>unicentaopos</artifactId>
|
||||||
<version>5.0.2-SNAPSHOT</version>
|
<version>5.3</version>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
<properties>
|
<properties>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
@@ -153,7 +153,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.jpos</groupId>
|
<groupId>org.jpos</groupId>
|
||||||
<artifactId>jpos</artifactId>
|
<artifactId>jpos</artifactId>
|
||||||
<version>2.0.10</version>
|
<version>2.1.9</version>
|
||||||
<exclusions>
|
<exclusions>
|
||||||
<exclusion>
|
<exclusion>
|
||||||
<groupId>org.slf4j</groupId>
|
<groupId>org.slf4j</groupId>
|
||||||
@@ -325,7 +325,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.unicenta</groupId>
|
<groupId>com.unicenta</groupId>
|
||||||
<artifactId>unicenta-plugins</artifactId>
|
<artifactId>unicenta-plugins</artifactId>
|
||||||
<version>1.2</version>
|
<version>1.2.6</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.gluonhq</groupId>
|
<groupId>com.gluonhq</groupId>
|
||||||
@@ -391,6 +391,11 @@
|
|||||||
<version>2.1.3</version>
|
<version>2.1.3</version>
|
||||||
<type>jar</type>
|
<type>jar</type>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.google.code.gson</groupId>
|
||||||
|
<artifactId>gson</artifactId>
|
||||||
|
<version>2.8.9</version>
|
||||||
|
</dependency>
|
||||||
<!-- https://mvnrepository.com/artifact/junit/junit -->
|
<!-- https://mvnrepository.com/artifact/junit/junit -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>junit</groupId>
|
<groupId>junit</groupId>
|
||||||
@@ -549,34 +554,27 @@
|
|||||||
<finalName>unicentaopos</finalName>
|
<finalName>unicentaopos</finalName>
|
||||||
</build>
|
</build>
|
||||||
<repositories>
|
<repositories>
|
||||||
|
<repository>
|
||||||
|
<id>central</id>
|
||||||
|
<url>https://repo1.maven.org/maven2/</url>
|
||||||
|
<layout>default</layout>
|
||||||
|
</repository>
|
||||||
<repository>
|
<repository>
|
||||||
<id>charm-glisten</id>
|
<id>charm-glisten</id>
|
||||||
<name>charm-glisten Repository</name>
|
<name>charm-glisten Repository</name>
|
||||||
<url>https://nexus.gluonhq.com/nexus/content/repositories/releases/</url>
|
<url>https://nexus.gluonhq.com/nexus/content/repositories/releases/</url>
|
||||||
<layout>default</layout>
|
<layout>default</layout>
|
||||||
</repository>
|
</repository>
|
||||||
<repository>
|
|
||||||
<id>unicenta-repo</id>
|
|
||||||
<url>https://repo.unicenta.org/maven2/</url>
|
|
||||||
<layout>default</layout>
|
|
||||||
</repository>
|
|
||||||
<repository>
|
|
||||||
<id>central</id>
|
|
||||||
<url>https://repo1.maven.org/maven2/</url>
|
|
||||||
<layout>default</layout>
|
|
||||||
</repository>
|
|
||||||
<!--These are needed for Swing/Netbeans
|
|
||||||
<repository>
|
|
||||||
<id>netbeans</id>
|
|
||||||
<name>NetBeans</name>
|
|
||||||
<url>https://netbeans.apidesign.org/maven2/</url>
|
|
||||||
</repository>-->
|
|
||||||
<!--These are needed for Swing/Netbeans -->
|
|
||||||
<repository>
|
<repository>
|
||||||
<id>flatlaf</id>
|
<id>flatlaf</id>
|
||||||
<name>flatlaf</name>
|
<name>flatlaf</name>
|
||||||
<url>https://dev.webswing.org/public/nexus/repository/webswing-3rd-parties//</url>
|
<url>https://dev.webswing.org/public/nexus/repository/webswing-3rd-parties//</url>
|
||||||
</repository>
|
</repository>
|
||||||
|
<repository>
|
||||||
|
<id>unicenta-repo</id>
|
||||||
|
<url>https://repo.unicenta.org/maven2/</url>
|
||||||
|
<layout>default</layout>
|
||||||
|
</repository>
|
||||||
</repositories>
|
</repositories>
|
||||||
<distributionManagement>
|
<distributionManagement>
|
||||||
<repository>
|
<repository>
|
||||||
|
|||||||
@@ -52,6 +52,7 @@ public class JPanelConfigPayment extends javax.swing.JPanel implements PanelConf
|
|||||||
initPayments("Not defined", new ConfigPaymentPanelEmpty());
|
initPayments("Not defined", new ConfigPaymentPanelEmpty());
|
||||||
initPayments("external", new ConfigPaymentPanelEmpty());
|
initPayments("external", new ConfigPaymentPanelEmpty());
|
||||||
initPayments("PaymentSense", new ConfigPaymentPanelEmpty());
|
initPayments("PaymentSense", new ConfigPaymentPanelEmpty());
|
||||||
|
initPayments("Teya", new ConfigPaymentPanelEmpty());
|
||||||
|
|
||||||
// Lector de tarjetas.
|
// Lector de tarjetas.
|
||||||
jcboCardReader.addItem("Not defined");
|
jcboCardReader.addItem("Not defined");
|
||||||
@@ -277,6 +278,12 @@ public class JPanelConfigPayment extends javax.swing.JPanel implements PanelConf
|
|||||||
emvConfigPanel.setVisible(Boolean.TRUE);
|
emvConfigPanel.setVisible(Boolean.TRUE);
|
||||||
jcboCardReader.setSelectedItem("EMV");
|
jcboCardReader.setSelectedItem("EMV");
|
||||||
jcboCardReader.setEnabled(Boolean.FALSE);
|
jcboCardReader.setEnabled(Boolean.FALSE);
|
||||||
|
|
||||||
|
}
|
||||||
|
else if (comboValue(jcboPaymentGateway.getSelectedItem()).equals("Teya")) {
|
||||||
|
emvConfigPanel.setVisible(Boolean.FALSE);
|
||||||
|
jcboCardReader.setSelectedItem("EMV");
|
||||||
|
jcboCardReader.setEnabled(Boolean.FALSE);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
emvConfigPanel.setVisible(Boolean.FALSE);
|
emvConfigPanel.setVisible(Boolean.FALSE);
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ public class AppLocal {
|
|||||||
|
|
||||||
public static final String APP_NAME = "uniCenta oPOS";
|
public static final String APP_NAME = "uniCenta oPOS";
|
||||||
public static final String APP_ID = "unicentaopos";
|
public static final String APP_ID = "unicentaopos";
|
||||||
public static final String APP_VERSION = "5.0.1";
|
public static final String APP_VERSION = "5.3";
|
||||||
|
|
||||||
private static final LocaleResources m_resources;
|
private static final LocaleResources m_resources;
|
||||||
|
|
||||||
|
|||||||
@@ -39,6 +39,8 @@ public class PaymentGatewayFac {
|
|||||||
return new PaymentGatewayExt();
|
return new PaymentGatewayExt();
|
||||||
case "PaymentSense":
|
case "PaymentSense":
|
||||||
return new PaymentGatewayPaymentSense();
|
return new PaymentGatewayPaymentSense();
|
||||||
|
case "Teya":
|
||||||
|
return new PaymentGatewayTeya();
|
||||||
default:
|
default:
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ import lombok.extern.slf4j.Slf4j;
|
|||||||
|
|
||||||
import javax.swing.*;
|
import javax.swing.*;
|
||||||
import java.awt.*;
|
import java.awt.*;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
|
||||||
@Slf4j
|
@Slf4j
|
||||||
public class PaymentGatewayPaymentSense implements PaymentGateway {
|
public class PaymentGatewayPaymentSense implements PaymentGateway {
|
||||||
@@ -34,13 +35,26 @@ public class PaymentGatewayPaymentSense implements PaymentGateway {
|
|||||||
public PaymentGatewayPaymentSense() {
|
public PaymentGatewayPaymentSense() {
|
||||||
}
|
}
|
||||||
|
|
||||||
Window getPaymentWindow() {
|
Window getPaymentWindow(double amount) {
|
||||||
|
if (amount > 0) {
|
||||||
|
ArrayList<JPaymentSelectReceipt> paymentWindows = new ArrayList<>();
|
||||||
for (Window window : Window.getWindows()) {
|
for (Window window : Window.getWindows()) {
|
||||||
if (window.isActive()) {
|
if (window instanceof JPaymentSelectReceipt) {
|
||||||
return window;
|
paymentWindows.add((JPaymentSelectReceipt) window);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return null;
|
return paymentWindows.get(paymentWindows.size()-1);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
ArrayList<JPaymentSelectRefund> paymentWindows = new ArrayList<>();
|
||||||
|
for (Window window : Window.getWindows()) {
|
||||||
|
if (window instanceof JPaymentSelectRefund) {
|
||||||
|
paymentWindows.add((JPaymentSelectRefund) window);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return paymentWindows.get(paymentWindows.size()-1);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -53,7 +67,8 @@ public class PaymentGatewayPaymentSense implements PaymentGateway {
|
|||||||
int timer = 0;
|
int timer = 0;
|
||||||
int timeout = 180;
|
int timeout = 180;
|
||||||
|
|
||||||
new Application().paymentSenseTransaction(RoundUtils.round(payinfo.getTotal()), getPaymentWindow());
|
double roundedValue = RoundUtils.round(payinfo.getTotal());
|
||||||
|
new Application().paymentSenseTransaction(roundedValue, getPaymentWindow(roundedValue));
|
||||||
|
|
||||||
while (AppContext.getIsProcessing() == null || AppContext.getIsProcessing()) {
|
while (AppContext.getIsProcessing() == null || AppContext.getIsProcessing()) {
|
||||||
try {
|
try {
|
||||||
|
|||||||
@@ -0,0 +1,101 @@
|
|||||||
|
// uniCenta oPOS - Touch Friendly Point Of Sale
|
||||||
|
// Copyright (c) 2009-2018 uniCenta & previous Openbravo POS works
|
||||||
|
// https://unicenta.com
|
||||||
|
//
|
||||||
|
// This file is part of uniCenta oPOS
|
||||||
|
//
|
||||||
|
// uniCenta oPOS is free software: you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation, either version 3 of the License, or
|
||||||
|
// (at your option) any later version.
|
||||||
|
//
|
||||||
|
// uniCenta oPOS is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU General Public License
|
||||||
|
// along with uniCenta oPOS. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
package com.unicenta.pos.payment;
|
||||||
|
|
||||||
|
import com.unicenta.plugins.Application;
|
||||||
|
import com.unicenta.plugins.common.AppContext;
|
||||||
|
import com.unicenta.pos.util.RoundUtils;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
|
||||||
|
import java.awt.*;
|
||||||
|
import java.util.ArrayList;
|
||||||
|
|
||||||
|
@Slf4j
|
||||||
|
public class PaymentGatewayTeya implements PaymentGateway {
|
||||||
|
|
||||||
|
/** Creates a new instance of PaymentGatewayExt */
|
||||||
|
public PaymentGatewayTeya() {
|
||||||
|
}
|
||||||
|
|
||||||
|
Window getPaymentWindow(double amount) {
|
||||||
|
if (amount > 0) {
|
||||||
|
ArrayList<JPaymentSelectReceipt> paymentWindows = new ArrayList<>();
|
||||||
|
for (Window window : Window.getWindows()) {
|
||||||
|
if (window instanceof JPaymentSelectReceipt) {
|
||||||
|
paymentWindows.add((JPaymentSelectReceipt) window);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return paymentWindows.get(paymentWindows.size()-1);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
ArrayList<JPaymentSelectRefund> paymentWindows = new ArrayList<>();
|
||||||
|
for (Window window : Window.getWindows()) {
|
||||||
|
if (window instanceof JPaymentSelectRefund) {
|
||||||
|
paymentWindows.add((JPaymentSelectRefund) window);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return paymentWindows.get(paymentWindows.size()-1);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
* @param payinfo
|
||||||
|
*/
|
||||||
|
@Override
|
||||||
|
public void execute(PaymentInfoMagcard payinfo) {
|
||||||
|
|
||||||
|
int timer = 0;
|
||||||
|
int timeout = 150;
|
||||||
|
|
||||||
|
double roundedValue = RoundUtils.round(payinfo.getTotal());
|
||||||
|
|
||||||
|
new Application().teyaTransaction(roundedValue, getPaymentWindow(roundedValue), payinfo.getTransactionID());
|
||||||
|
|
||||||
|
while (AppContext.getTeyaPaymentResult() == null) {
|
||||||
|
try {
|
||||||
|
log.info("uniCenta-oPos: waiting for payment to complete ....");
|
||||||
|
Thread.sleep(1000);
|
||||||
|
timer += 1;
|
||||||
|
if (timer > timeout) break;
|
||||||
|
} catch (InterruptedException e) {
|
||||||
|
log.error(e.getMessage());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (AppContext.getTeyaPaymentResult().getStatus().equals("SUCCESSFUL")) {
|
||||||
|
payinfo.setCardName("Teya");
|
||||||
|
payinfo.setVerification("Chip and Pin");
|
||||||
|
payinfo.setChipAndPin(true);
|
||||||
|
payinfo.paymentOK(
|
||||||
|
roundedValue > 0 ? AppContext.getTeyaPaymentResult().getReferenceId() : "",
|
||||||
|
roundedValue > 0 ? AppContext.getTeyaPaymentResult().getGatewayPaymentId() : "",
|
||||||
|
AppContext.getTeyaPaymentResult().getStatus()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
payinfo.paymentError("Transaction Error! Please try again", AppContext.getTeyaPaymentResult().getStatus());
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -33,17 +33,17 @@ import com.unicenta.pos.sales.ReprintTicketInfo;
|
|||||||
import com.unicenta.pos.sales.SharedTicketInfo;
|
import com.unicenta.pos.sales.SharedTicketInfo;
|
||||||
import com.unicenta.pos.sales.TicketsEditor;
|
import com.unicenta.pos.sales.TicketsEditor;
|
||||||
import com.unicenta.pos.ticket.TicketInfo;
|
import com.unicenta.pos.ticket.TicketInfo;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
import javax.swing.JComponent;
|
import javax.swing.*;
|
||||||
import javax.swing.JOptionPane;
|
|
||||||
import javax.swing.JPanel;
|
|
||||||
import javax.swing.SwingUtilities;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
* @author JG uniCenta
|
* @author JG uniCenta
|
||||||
*/
|
*/
|
||||||
|
@Slf4j
|
||||||
public class JTicketsBagShared extends JTicketsBag {
|
public class JTicketsBagShared extends JTicketsBag {
|
||||||
|
|
||||||
private String m_sCurrentTicket = null;
|
private String m_sCurrentTicket = null;
|
||||||
@@ -76,6 +76,24 @@ public class JTicketsBagShared extends JTicketsBag {
|
|||||||
@Override
|
@Override
|
||||||
public void activate() {
|
public void activate() {
|
||||||
|
|
||||||
|
log.debug("Loading Sales screen! "+this.getClass());
|
||||||
|
|
||||||
|
SwingWorker<String, String> reloadLayaway = new SwingWorker<>() {
|
||||||
|
@Override
|
||||||
|
protected String doInBackground() throws Exception {
|
||||||
|
while (true) {
|
||||||
|
log.debug("refresh screen");
|
||||||
|
updateCount();
|
||||||
|
Thread.sleep(5000);
|
||||||
|
}
|
||||||
|
|
||||||
|
//return null;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
reloadLayaway.execute();
|
||||||
|
|
||||||
|
|
||||||
m_sCurrentTicket = null;
|
m_sCurrentTicket = null;
|
||||||
selectValidTicket();
|
selectValidTicket();
|
||||||
|
|
||||||
@@ -362,9 +380,9 @@ public class JTicketsBagShared extends JTicketsBag {
|
|||||||
|| m_App.getAppUserView().getUser().hasPermission("sales.ViewSharedTicket")
|
|| m_App.getAppUserView().getUser().hasPermission("sales.ViewSharedTicket")
|
||||||
|| m_App.getAppUserView().getUser().hasPermission("sales.Override"))
|
|| m_App.getAppUserView().getUser().hasPermission("sales.Override"))
|
||||||
{
|
{
|
||||||
List<SharedTicketInfo> l = dlReceipts.getSharedTicketList();
|
List<SharedTicketInfo> sharedTicketList = dlReceipts.getSharedTicketList();
|
||||||
JTicketsBagSharedList listDialog = JTicketsBagSharedList.newJDialog(JTicketsBagShared.this);
|
JTicketsBagSharedList listDialog = JTicketsBagSharedList.newJDialog(JTicketsBagShared.this);
|
||||||
String id = listDialog.showTicketsList(l, dlReceipts);
|
String id = listDialog.showTicketsList(sharedTicketList, dlReceipts);
|
||||||
|
|
||||||
if (id != null) {
|
if (id != null) {
|
||||||
saveCurrentTicket();
|
saveCurrentTicket();
|
||||||
|
|||||||
@@ -1,7 +1 @@
|
|||||||
UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/script.Linediscount.txt} WHERE name = 'script.Linediscount';
|
|
||||||
|
|
||||||
UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/script.Totaldiscount.txt} WHERE name = 'script.Totaldiscount';
|
|
||||||
|
|
||||||
UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/script.multibuy.txt} WHERE name = 'script.multibuy';
|
|
||||||
|
|
||||||
UPDATE applications SET version = $APP_VERSION{} WHERE id = $APP_ID{};
|
UPDATE applications SET version = $APP_VERSION{} WHERE id = $APP_ID{};
|
||||||
@@ -1,70 +1,2 @@
|
|||||||
-- CLEAR THE DECKS
|
UPDATE applications SET version = $APP_VERSION{} WHERE id = $APP_ID{};
|
||||||
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;
|
|
||||||
|
|
||||||
UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/script.Linediscount.txt} WHERE name = 'script.Linediscount';
|
|
||||||
COMMIT;
|
|
||||||
|
|
||||||
UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/script.Totaldiscount.txt} WHERE name = 'script.Totaldiscount';
|
|
||||||
COMMIT;
|
|
||||||
|
|
||||||
UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/script.multibuy.txt} WHERE name = 'script.multibuy';
|
|
||||||
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{}, $APP_VERSION{});
|
|
||||||
|
|
||||||
COMMIT;
|
COMMIT;
|
||||||
@@ -1,70 +1,2 @@
|
|||||||
-- CLEAR THE DECKS
|
UPDATE applications SET version = $APP_VERSION{} WHERE id = $APP_ID{};
|
||||||
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;
|
|
||||||
|
|
||||||
UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/script.Linediscount.txt} WHERE name = 'script.Linediscount';
|
|
||||||
COMMIT;
|
|
||||||
|
|
||||||
UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/script.Totaldiscount.txt} WHERE name = 'script.Totaldiscount';
|
|
||||||
COMMIT;
|
|
||||||
|
|
||||||
UPDATE resources SET content = $FILE{/com/unicenta/pos/templates/script.multibuy.txt} WHERE name = 'script.multibuy';
|
|
||||||
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{}, $APP_VERSION{});
|
|
||||||
|
|
||||||
COMMIT;
|
COMMIT;
|
||||||
@@ -218,7 +218,6 @@
|
|||||||
<line><text>Tranx ID : </text><text>${paymentline.printTransactionID()}</text></line>
|
<line><text>Tranx ID : </text><text>${paymentline.printTransactionID()}</text></line>
|
||||||
<line><text>Auth Code : </text><text>${paymentline.printAuthorization()}</text></line>
|
<line><text>Auth Code : </text><text>${paymentline.printAuthorization()}</text></line>
|
||||||
<line><text>Verified By : </text><text>${paymentline.printVerification()}</text></line>
|
<line><text>Verified By : </text><text>${paymentline.printVerification()}</text></line>
|
||||||
<line><text>Card # (last 4) : </text><text>${paymentline.printLastFourDigits()}</text></line>
|
|
||||||
#end
|
#end
|
||||||
#if (!$paymentline.chipAndPin)
|
#if (!$paymentline.chipAndPin)
|
||||||
<line size="1"><text align="center" length="42" bold="true">CARD SALE</text></line>
|
<line size="1"><text align="center" length="42" bold="true">CARD SALE</text></line>
|
||||||
|
|||||||
@@ -881,7 +881,7 @@ message.email=Desktop email app' not found
|
|||||||
message.emptycustomer=Customer cannot be empty
|
message.emptycustomer=Customer cannot be empty
|
||||||
message.emptynumber=Number cannot be empty
|
message.emptynumber=Number cannot be empty
|
||||||
message.enterbuyprice=Enter new Buy Price
|
message.enterbuyprice=Enter new Buy Price
|
||||||
message.eolupdate=<html><center><h2>Version 5.0.1 Upgrade!</h2></br><h3>Your current database version is {0}</h3><br>For version 5.0 click <b>YES</b><br/><br/>For any other version click <b>NO</b> and get to 5.0 first<br><br/>
|
message.eolupdate=<html><center><h2>Version 5.3 Upgrade!</h2></br><h3>Your current database version is {0}</h3><br>For version 5.2 click <b>YES</b><br/><br/>For any other version click <b>NO</b> and get to 5.2 first<br><br/>
|
||||||
message.ibuttonassign=<html><center>Get the iButton ID<br>Place iButton onto the reader then click OK
|
message.ibuttonassign=<html><center>Get the iButton ID<br>Place iButton onto the reader then click OK
|
||||||
message.ibuttonnotassign=<html><center>The iButton used is not yet assigned to anyone
|
message.ibuttonnotassign=<html><center>The iButton used is not yet assigned to anyone
|
||||||
message.ibuttonnotfound=No iButton adapter found. Key fobs will be disabled.
|
message.ibuttonnotfound=No iButton adapter found. Key fobs will be disabled.
|
||||||
|
|||||||
@@ -1190,4 +1190,4 @@ cboption.find=Buscar
|
|||||||
button.prodhtmldisplayFont=Tipo de fuente
|
button.prodhtmldisplayFont=Tipo de fuente
|
||||||
button.prodhtmldisplayImage=Imagen
|
button.prodhtmldisplayImage=Imagen
|
||||||
label.csvclear=Diario de importaci\u00f3n
|
label.csvclear=Diario de importaci\u00f3n
|
||||||
message.eolupdate=<html><center><h3>uniCenta oPOS Versi\u00f3n {0} detectada!</h3><h4>\u00a1Las actualizaciones de la versi\u00f3n est\u00e1n cambiando!</h4> Si su versi\u00f3n es 4.5 o posterior, elija <b>S\u00cd</b> para continuar.<br/><br/> Para versiones anteriores, haga clic en <b>NO</b> para abrir Opciones de configuraci\u00f3n ahora.<br/></br>Lea la Gu\u00eda de transferencia de datos de uniCenta oPOS
|
message.eolupdate=<html><center><h3>uniCenta oPOS Versi\u00f3n {0} detectada!</h3><h4>\u00a1Las actualizaciones de la versi\u00f3n est\u00e1n cambiando!</h4> Si su versi\u00f3n es 5.2 o posterior, elija <b>S\u00cd</b> para continuar.<br/><br/> Para versiones anteriores, haga clic en <b>NO</b> para abrir Opciones de configuraci\u00f3n ahora.<br/></br>Lea la Gu\u00eda de transferencia de datos de uniCenta oPOS
|
||||||
@@ -468,4 +468,4 @@ transpayment.ticket=Ticket
|
|||||||
transpayment.voucherin=Vales cobrados
|
transpayment.voucherin=Vales cobrados
|
||||||
transpayment.voucherout=Vales emitidos
|
transpayment.voucherout=Vales emitidos
|
||||||
Visor.Title=uniCenta oPOS
|
Visor.Title=uniCenta oPOS
|
||||||
message.eolupdate=<html><center><h3>uniCenta oPOS Versi\u00f3n {0} detectada!</h3><h4>\u00a1Las actualizaciones de la versi\u00f3n est\u00e1n cambiando!</h4> Si su versi\u00f3n es 4.5 o posterior, elija <b>S\u00cd</b> para continuar.<br/><br/> Para versiones anteriores, haga clic en <b>NO</b> para abrir Opciones de configuraci\u00f3n ahora.<br/></br>Lea la Gu\u00eda de transferencia de datos de uniCenta oPOS
|
message.eolupdate=<html><center><h3>uniCenta oPOS Versi\u00f3n {0} detectada!</h3><h4>\u00a1Las actualizaciones de la versi\u00f3n est\u00e1n cambiando!</h4> Si su versi\u00f3n es 5.2 o posterior, elija <b>S\u00cd</b> para continuar.<br/><br/> Para versiones anteriores, haga clic en <b>NO</b> para abrir Opciones de configuraci\u00f3n ahora.<br/></br>Lea la Gu\u00eda de transferencia de datos de uniCenta oPOS
|
||||||
@@ -911,7 +911,7 @@ message.transfermessage=Database overdracht
|
|||||||
message.transfernotsupported=Database overdrachtstype wordt niet ondersteund
|
message.transfernotsupported=Database overdrachtstype wordt niet ondersteund
|
||||||
message.transfertitle=Database overdracht
|
message.transfertitle=Database overdracht
|
||||||
message.updatedatabase=<html><center><h3>uniCenta oPOS Version {0} database gedetecteerd!</h3> De database wordt automatisch geüpgraded.<br>GEGEVENS KUNNEN VERLOREN GAAN. MAAK EERST EEN BACKUP.<br><br>Wilt u doorgaan?
|
message.updatedatabase=<html><center><h3>uniCenta oPOS Version {0} database gedetecteerd!</h3> De database wordt automatisch geüpgraded.<br>GEGEVENS KUNNEN VERLOREN GAAN. MAAK EERST EEN BACKUP.<br><br>Wilt u doorgaan?
|
||||||
message.eolupdate=<html><center><h3>uniCenta oPOS Version {0} gedetecteerd!</h3><h4>Versie-upgrades veranderen!</h4>Als je versie 4.5 of hoger is kies<b>YES</b>om door te gaan<br/><br/>Voor oudere versies kies<b>NO</b> Om nu de configuratie opties te openen!<br>Lees alstublieft de uniCenta oPOS Data Transfer Guide<br/><br/>
|
message.eolupdate=<html><center><h3>uniCenta oPOS Version {0} gedetecteerd!</h3><h4>Versie-upgrades veranderen!</h4>Als je versie 5.2 of hoger is kies<b>YES</b>om door te gaan<br/><br/>Voor oudere versies kies<b>NO</b> Om nu de configuratie opties te openen!<br>Lees alstublieft de uniCenta oPOS Data Transfer Guide<br/><br/>
|
||||||
message.URL=<html>Een webpagina laten zien in het hoofdscherm . vereist de volledige URL<br />Voor een lokaal bestand begin met - <b>file://</b><br/>Voor een extern bestand gebruik <b>http://</b><br/>
|
message.URL=<html>Een webpagina laten zien in het hoofdscherm . vereist de volledige URL<br />Voor een lokaal bestand begin met - <b>file://</b><br/>Voor een extern bestand gebruik <b>http://</b><br/>
|
||||||
message.uuidcopy=<html><center><h4>UUID is gekopieerd naar het klembord
|
message.uuidcopy=<html><center><h4>UUID is gekopieerd naar het klembord
|
||||||
message.vipno=Klant is geen VIP
|
message.vipno=Klant is geen VIP
|
||||||
|
|||||||
Reference in New Issue
Block a user