diff --git a/src/org/openbravo/retail/posterminal/UpdateCashup.java b/src/org/openbravo/retail/posterminal/UpdateCashup.java index c3e316451d2b1871825279e0af0181251f6ded07..b5d582b12d4f8a3db167e13c728a618cc9865977 100644 --- a/src/org/openbravo/retail/posterminal/UpdateCashup.java +++ b/src/org/openbravo/retail/posterminal/UpdateCashup.java @@ -13,6 +13,10 @@ import java.sql.SQLException; import java.util.Date; import java.util.List; +import javax.enterprise.inject.Any; +import javax.enterprise.inject.Instance; +import javax.inject.Inject; + import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.codehaus.jettison.json.JSONArray; @@ -24,6 +28,7 @@ import org.hibernate.criterion.Restrictions; import org.hibernate.query.Query; import org.openbravo.base.exception.OBException; import org.openbravo.base.provider.OBProvider; +import org.openbravo.base.weld.WeldUtils; import org.openbravo.dal.service.OBCriteria; import org.openbravo.dal.service.OBDal; import org.openbravo.dal.service.OBQuery; @@ -37,6 +42,10 @@ public class UpdateCashup { private static final Logger log = LogManager.getLogger(); + @Inject + @Any + private Instance updates; + /** * Get and update a cashup. If cashup not exist it's created, otherwise update the cashup data * into database. @@ -149,6 +158,13 @@ public class UpdateCashup { || (posTerminal.getMasterterminal() != null && cashUp.getObposParentCashup() == null)) { associateMasterSlave(cashUp, posTerminal); } + + try { + executeUpdateCashupHook(cashUp, jsonCashup); + } catch (Exception e) { + throw new OBException(e); + } + // If synchronize mode is active, there is no way to process two cashups with the same id at // the same time. OBDal.getInstance().flush(); @@ -482,4 +498,11 @@ public class UpdateCashup { } } + + private static void executeUpdateCashupHook(OBPOSAppCashup cashUp, JSONObject jsonCashup) + throws Exception { + for (UpdateCashupHook hook : WeldUtils.getInstances(UpdateCashupHook.class)) { + hook.exec(cashUp, jsonCashup); + } + } } diff --git a/src/org/openbravo/retail/posterminal/UpdateCashupHook.java b/src/org/openbravo/retail/posterminal/UpdateCashupHook.java new file mode 100644 index 0000000000000000000000000000000000000000..12025941affd5c68750ab457a843063405c1a995 --- /dev/null +++ b/src/org/openbravo/retail/posterminal/UpdateCashupHook.java @@ -0,0 +1,16 @@ +/* + ************************************************************************************ + * Copyright (C) 2020 Openbravo S.L.U. + * Licensed under the Openbravo Commercial License version 1.0 + * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html + * or in the legal folder of this module distribution. + ************************************************************************************ + */ +package org.openbravo.retail.posterminal; + +import org.codehaus.jettison.json.JSONObject; + +public interface UpdateCashupHook { + + public void exec(OBPOSAppCashup cashUp, JSONObject jsonCashup) throws Exception; +} diff --git a/src/org/openbravo/retail/posterminal/ad_reports/CashUpReport.jrxml b/src/org/openbravo/retail/posterminal/ad_reports/CashUpReport.jrxml index 28142bdcb86b9f2afb88e5c2e78669d428ccf0c0..7571ff4826061ec49246feb5d4b06ea48b9c5b69 100644 --- a/src/org/openbravo/retail/posterminal/ad_reports/CashUpReport.jrxml +++ b/src/org/openbravo/retail/posterminal/ad_reports/CashUpReport.jrxml @@ -1,5 +1,6 @@ - + + @@ -30,6 +31,9 @@ + + + @@ -98,13 +102,14 @@ - <band height="369" splitType="Stretch"> + <band height="380" splitType="Stretch"> + <property name="com.jaspersoft.studio.unit.height" value="pixel"/> <image> <reportElement x="210" y="14" width="100" height="50" uuid="904c52ff-6c99-493e-b9c3-cc0c5f95c751"/> <imageExpression><![CDATA[org.openbravo.erpCommon.utility.Utility.showImageLogo("yourcompanydoc", $P{TERMINAL_ORGANIZATION})]]></imageExpression> </image> <textField> - <reportElement positionType="Float" x="30" y="169" width="367" height="20" uuid="67a89959-d787-4cf0-8ceb-767e3027a966"/> + <reportElement positionType="Float" x="30" y="191" width="367" height="20" uuid="67a89959-d787-4cf0-8ceb-767e3027a966"/> <box leftPadding="5" rightPadding="5"> <pen lineWidth="1.0" lineColor="#867D7D"/> <topPen lineWidth="1.0" lineColor="#867D7D"/> @@ -116,7 +121,7 @@ <textFieldExpression><![CDATA[$P{NET_SALES_LABEL}]]></textFieldExpression> </textField> <textField> - <reportElement positionType="Float" x="397" y="169" width="111" height="20" uuid="0fa96316-07c7-4d2d-9519-78dc36d40835"/> + <reportElement positionType="Float" x="397" y="191" width="111" height="20" uuid="0fa96316-07c7-4d2d-9519-78dc36d40835"/> <box leftPadding="5" rightPadding="5"> <pen lineWidth="1.0" lineColor="#867D7D"/> <topPen lineColor="#867D7D"/> @@ -128,7 +133,7 @@ <textFieldExpression><![CDATA[$P{NUMBERFORMAT}.format(new BigDecimal($P{NET_SALES_VALUE}))]]></textFieldExpression> </textField> <textField> - <reportElement positionType="Float" x="397" y="209" width="111" height="20" uuid="02a7507b-b2cf-4272-aff8-9f6c130b020a"/> + <reportElement positionType="Float" x="397" y="231" width="111" height="20" uuid="02a7507b-b2cf-4272-aff8-9f6c130b020a"/> <box leftPadding="5" rightPadding="5"> <pen lineWidth="1.0" lineColor="#867D7D"/> <topPen lineColor="#867D7D"/> @@ -142,7 +147,7 @@ <textFieldExpression><![CDATA[$P{NUMBERFORMAT}.format(new BigDecimal($P{GROSS_SALES_VALUE}))]]></textFieldExpression> </textField> <textField> - <reportElement positionType="Float" x="30" y="209" width="367" height="20" uuid="9caa2f75-c4d3-439f-8540-c701a3899892"/> + <reportElement positionType="Float" x="30" y="231" width="367" height="20" uuid="9caa2f75-c4d3-439f-8540-c701a3899892"/> <box leftPadding="5" rightPadding="5"> <pen lineWidth="1.0" lineColor="#867D7D"/> <topPen lineWidth="1.0" lineColor="#867D7D"/> @@ -156,7 +161,7 @@ <textFieldExpression><![CDATA[$P{GROSS_SALES_LABEL}]]></textFieldExpression> </textField> <subreport> - <reportElement positionType="Float" x="0" y="263" width="555" height="20" isRemoveLineWhenBlank="true" uuid="47425024-9914-4b21-90f5-251dcef7f034"/> + <reportElement positionType="Float" x="0" y="285" width="555" height="20" isRemoveLineWhenBlank="true" uuid="47425024-9914-4b21-90f5-251dcef7f034"/> <subreportParameter name="NUMBERFORMAT"> <subreportParameterExpression><![CDATA[$P{NUMBERFORMAT}]]></subreportParameterExpression> </subreportParameter> @@ -164,7 +169,7 @@ <subreportExpression><![CDATA[$P{SUBREP_CashUpSubreport}]]></subreportExpression> </subreport> <subreport runToBottom="false"> - <reportElement positionType="Float" mode="Transparent" x="0" y="189" width="555" height="20" isRemoveLineWhenBlank="true" uuid="6a30967c-fb74-419d-b0d1-7d46176e6c7e"/> + <reportElement positionType="Float" mode="Transparent" x="0" y="211" width="555" height="20" isRemoveLineWhenBlank="true" uuid="6a30967c-fb74-419d-b0d1-7d46176e6c7e"/> <subreportParameter name="NUMBERFORMAT"> <subreportParameterExpression><![CDATA[$P{NUMBERFORMAT}]]></subreportParameterExpression> </subreportParameter> @@ -172,7 +177,7 @@ <subreportExpression><![CDATA[$P{SUBREP_CashUpSubreport}]]></subreportExpression> </subreport> <textField> - <reportElement positionType="Float" x="397" y="243" width="111" height="20" uuid="e63eda87-ff45-4c29-8018-0d0b56d58641"/> + <reportElement positionType="Float" x="397" y="265" width="111" height="20" uuid="e63eda87-ff45-4c29-8018-0d0b56d58641"/> <box leftPadding="5" rightPadding="5"> <pen lineWidth="1.0" lineColor="#867D7D"/> <topPen lineColor="#867D7D"/> @@ -184,7 +189,7 @@ <textFieldExpression><![CDATA[$P{NUMBERFORMAT}.format(new BigDecimal($P{NET_RETURNS_VALUE}))]]></textFieldExpression> </textField> <textField> - <reportElement positionType="Float" x="30" y="243" width="367" height="20" uuid="d6ee0c26-8957-44f6-8b67-0ec824dae47a"/> + <reportElement positionType="Float" x="30" y="265" width="367" height="20" uuid="d6ee0c26-8957-44f6-8b67-0ec824dae47a"/> <box leftPadding="5" rightPadding="5"> <pen lineWidth="1.0" lineColor="#867D7D"/> <topPen lineWidth="1.0" lineColor="#867D7D"/> @@ -196,7 +201,7 @@ <textFieldExpression><![CDATA[$P{NET_RETURNS_LABEL}]]></textFieldExpression> </textField> <textField> - <reportElement positionType="Float" x="30" y="283" width="367" height="20" uuid="962ee5ea-43be-4133-92de-5bcba5b01d76"/> + <reportElement positionType="Float" x="30" y="305" width="367" height="20" uuid="962ee5ea-43be-4133-92de-5bcba5b01d76"/> <box leftPadding="5" rightPadding="5"> <pen lineWidth="1.0" lineColor="#867D7D"/> <topPen lineWidth="1.0" lineColor="#867D7D"/> @@ -210,7 +215,7 @@ <textFieldExpression><![CDATA[$P{GROSS_RETURNS_LABEL}]]></textFieldExpression> </textField> <textField> - <reportElement positionType="Float" x="397" y="283" width="111" height="20" uuid="f7f95008-5a50-468a-9dea-273f1404d093"/> + <reportElement positionType="Float" x="397" y="305" width="111" height="20" uuid="f7f95008-5a50-468a-9dea-273f1404d093"/> <box leftPadding="5" rightPadding="5"> <pen lineWidth="1.0" lineColor="#867D7D"/> <topPen lineColor="#867D7D"/> @@ -224,7 +229,7 @@ <textFieldExpression><![CDATA[$P{NUMBERFORMAT}.format(new BigDecimal($P{GROSS_RETURNS_VALUE}))]]></textFieldExpression> </textField> <textField> - <reportElement positionType="Float" x="30" y="320" width="367" height="20" uuid="8d035685-698d-4988-8e25-5a25fcde9d6b"/> + <reportElement positionType="Float" x="30" y="342" width="367" height="20" uuid="8d035685-698d-4988-8e25-5a25fcde9d6b"/> <box leftPadding="5" rightPadding="5"> <pen lineWidth="1.0" lineColor="#867D7D"/> <topPen lineWidth="1.0" lineColor="#867D7D"/> @@ -236,7 +241,7 @@ <textFieldExpression><![CDATA[$P{TOTAL_RETAIL_TRANS_LABEL}]]></textFieldExpression> </textField> <textField> - <reportElement positionType="Float" x="397" y="320" width="111" height="20" uuid="3e60d075-10e2-4b0d-bcdf-6fdf2ebbeba4"/> + <reportElement positionType="Float" x="397" y="342" width="111" height="20" uuid="3e60d075-10e2-4b0d-bcdf-6fdf2ebbeba4"/> <box leftPadding="5" rightPadding="5"> <pen lineWidth="1.0" lineColor="#867D7D"/> <topPen lineColor="#867D7D"/> @@ -267,6 +272,13 @@ <textElement textAlignment="Center"/> <textFieldExpression><![CDATA[$P{TIME}]]></textFieldExpression> </textField> + <textField isStretchWithOverflow="true" isBlankWhenNull="true"> + <reportElement x="80" y="160" width="400" height="20" uuid="86b526d7-2d7b-489e-ac60-5f70cc4251f4"> + <printWhenExpression><![CDATA[$P{OBQCU_IS_QUICK_CASHUP}.length() > 0]]></printWhenExpression> + </reportElement> + <textElement textAlignment="Center"/> + <textFieldExpression><![CDATA[$P{OBQCU_IS_QUICK_CASHUP}]]></textFieldExpression> + </textField> </band>