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

5.3.1 release (#36)

Browse Source 
* UOCL-265: Spanish translation improvements

* UOCL-246: Reprint receipt fix

* UOCL-246: Reprint receipt fix

* UOCL-246: reprint receipt

* UOCL-283: Porting ZATCA QR-code!

* UOCL-283: Porting ZATCA QR-code!

* UOCL-246: reprint receipt

* UOCL-274: Top 10 sales rpt fix

* UOCL-274: Top 10 sales rpt fix

* 5.3.1 release
This commit is contained in:
hugh-unicenta
2024-05-20 17:03:58 +01:00
committed by GitHub
parent 63bdae5ca4
commit 33ab53f520
16 changed files with 685 additions and 417 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/com/unicenta/pos/templates/Printer.Ticket.xml
+1 -1
View File
@@ -254,7 +254,7 @@
<line></line>
#end
#end
<!-- ZACAT please see release notes -->
</ticket>
#foreach ($paymentline in $ticket.payments)
src/main/resources/com/unicenta/reports/sales_chart_top10.bs
+59 -20
View File
@@ -24,26 +24,65 @@ report.setTitleKey("Menu.Top10Sales");
report.setReport("/com/unicenta/reports/sales_chart_top10");
report.setResourceBundle("com/unicenta/reports/sales_messages");
report.setSentence(
"SELECT " +
"products.NAME,SUM(ticketlines.UNITS) AS UNITS, " +
"products.PRICEBUY,products.PRICESELL, " +
"SUM(ticketlines.PRICE * ticketlines.UNITS))AS SUBTOTAL, " +
"SUM((ticketlines.PRICE * ticketlines.UNITS) * taxes.RATE) AS TAXES, " +
"SUM(ticketlines.PRICE * ticketlines.UNITS) + SUM((ticketlines.PRICE * ticketlines.UNITS) * taxes.RATE) AS GROSSTOTAL " +
"FROM ticketlines " +
"LEFT OUTER JOIN products ON ticketlines.PRODUCT = products.ID " +
"LEFT OUTER JOIN tickets ON tickets.ID = ticketlines.TICKET " +
"LEFT OUTER JOIN receipts ON receipts.ID = tickets.ID, taxes " +
"WHERE receipts.ID = tickets.ID " +
"AND tickets.ID = ticketlines.TICKET " +
"AND ticketlines.PRODUCT = products.ID " +
"AND ticketlines.TAXID = taxes.ID " +
"AND ?(QBF_FILTER) " +
"GROUP BY products.NAME,products.PRICEBUY,products.PRICESELL " +
"ORDER BY GROSSTOTAL DESC " +
"LIMIT 10");
String maria = "SELECT \n" +
" products.NAME,\n" +
" SUM(ticketlines.UNITS) AS UNITS, \n" +
" products.PRICEBUY,\n" +
" products.PRICESELL, \n" +
" SUM(ticketlines.PRICE * ticketlines.UNITS) AS SUBTOTAL, \n" +
" SUM((ticketlines.PRICE * ticketlines.UNITS) * taxes.RATE) AS TAXES,\n" +
" SUM(ticketlines.PRICE * ticketlines.UNITS) + SUM((ticketlines.PRICE * ticketlines.UNITS) * taxes.RATE) AS GROSSTOTAL\n" +
"FROM \n" +
" ticketlines\n" +
" LEFT JOIN products ON ticketlines.PRODUCT = products.ID \n" +
" LEFT JOIN tickets ON tickets.ID = ticketlines.TICKET\n" +
" LEFT JOIN receipts ON receipts.ID = tickets.ID\n" +
" LEFT JOIN taxes ON ticketlines.TAXID = taxes.ID\n" +
"WHERE \n" +
" tickets.ID = ticketlines.TICKET\n" +
" AND ticketlines.PRODUCT = products.ID \n" +
" AND ticketlines.TAXID = taxes.ID\n" +
" AND ?(QBF_FILTER) " +
"GROUP BY \n" +
" products.NAME,\n" +
" products.PRICEBUY,\n" +
" products.PRICESELL\n" +
"ORDER BY \n" +
" GROSSTOTAL DESC \n" +
"LIMIT 10";
String derby = "SELECT \n" +
" products.NAME,\n" +
" SUM(ticketlines.UNITS) AS UNITS, \n" +
" products.PRICEBUY,\n" +
" products.PRICESELL, \n" +
" SUM(ticketlines.PRICE * ticketlines.UNITS) AS SUBTOTAL, \n" +
" SUM((ticketlines.PRICE * ticketlines.UNITS) * taxes.RATE) AS TAXES,\n" +
" SUM(ticketlines.PRICE * ticketlines.UNITS) + SUM((ticketlines.PRICE * ticketlines.UNITS) * taxes.RATE) AS GROSSTOTAL\n" +
"FROM \n" +
" ticketlines\n" +
" LEFT JOIN products ON ticketlines.PRODUCT = products.ID \n" +
" LEFT JOIN tickets ON tickets.ID = ticketlines.TICKET\n" +
" LEFT JOIN receipts ON receipts.ID = tickets.ID\n" +
" LEFT JOIN taxes ON ticketlines.TAXID = taxes.ID\n" +
"WHERE \n" +
" tickets.ID = ticketlines.TICKET\n" +
" AND ticketlines.PRODUCT = products.ID \n" +
" AND ticketlines.TAXID = taxes.ID\n" +
" AND ?(QBF_FILTER) " +
"GROUP BY \n" +
" products.NAME,\n" +
" products.PRICEBUY,\n" +
" products.PRICESELL\n" +
"ORDER BY \n" +
" GROSSTOTAL DESC \n" +
"FETCH FIRST 10 ROWS ONLY";
if (report.getDBType() == "derby") {
report.setSentence(derby);
} else {
report.setSentence(maria);
}
report.addParameter("receipts.DATENEW");
report.addParameter("receipts.DATENEW");