0030453: Retrieving cashup info from backend fails in one case

diff --git a/src-test/org/openbravo/retail/posterminal/cashup.json b/src-test/org/openbravo/retail/posterminal/cashup.json
--- a/src-test/org/openbravo/retail/posterminal/cashup.json
+++ b/src-test/org/openbravo/retail/posterminal/cashup.json
@@ -63,7 +63,7 @@
     "cashCloseInfo": [{
         "expected": 0,
         "difference": 0,
-        "paymentTypeId": "5EA2A7DEBB2A49A69550C7E3D8899ED5",
+        "paymentType": "5EA2A7DEBB2A49A69550C7E3D8899ED5",
         "paymentMethod": {
             "_identifier": "Credit card",
             "_entityName": "OBPOS_App_Payment_Type",
@@ -122,7 +122,7 @@
     }, {
         "expected": 600.3,
         "difference": 0,
-        "paymentTypeId": "63339A82A49A4AE0BCD9AC5929B0EA3B",
+        "paymentType": "63339A82A49A4AE0BCD9AC5929B0EA3B",
         "paymentMethod": {
             "_identifier": "Cash",
             "_entityName": "OBPOS_App_Payment_Type",
@@ -184,7 +184,7 @@
     }, {
         "expected": 0,
         "difference": 0,
-        "paymentTypeId": "E11EBCB5CF0442618B72B903DCB6A036",
+        "paymentType": "E11EBCB5CF0442618B72B903DCB6A036",
         "paymentMethod": {
             "_identifier": "USA Cash",
             "_entityName": "OBPOS_App_Payment_Type",
@@ -245,7 +245,7 @@
     }, {
         "expected": 0,
         "difference": 0,
-        "paymentTypeId": "6E98C4DE459748BE997693E9ED956D21",
+        "paymentType": "6E98C4DE459748BE997693E9ED956D21",
         "paymentMethod": {
             "_identifier": "Voucher",
             "_entityName": "OBPOS_App_Payment_Type",
diff --git a/src/org/openbravo/retail/posterminal/CashCloseProcessor.java b/src/org/openbravo/retail/posterminal/CashCloseProcessor.java
--- a/src/org/openbravo/retail/posterminal/CashCloseProcessor.java
+++ b/src/org/openbravo/retail/posterminal/CashCloseProcessor.java
@@ -71,7 +71,7 @@
         foreignDifference = new BigDecimal(cashCloseObj.getString("foreignDifference"));
         differenceToApply = foreignDifference;
       }
-      String paymentTypeId = cashCloseObj.getString("paymentTypeId");
+      String paymentTypeId = cashCloseObj.getString("paymentType");
       OBPOSAppPayment paymentType = OBDal.getInstance().get(OBPOSAppPayment.class, paymentTypeId);
 
       FIN_Reconciliation reconciliation = createReconciliation(cashCloseObj, posTerminal,
diff --git a/src/org/openbravo/retail/posterminal/ProcessCashClose.java b/src/org/openbravo/retail/posterminal/ProcessCashClose.java
--- a/src/org/openbravo/retail/posterminal/ProcessCashClose.java
+++ b/src/org/openbravo/retail/posterminal/ProcessCashClose.java
@@ -200,8 +200,7 @@
           JSONArray cashCloseInfo = jsonCashup.getJSONArray("cashCloseInfo");
           for (int j = 0; j < cashCloseInfo.length(); ++j) {
             JSONObject paymentMethod = cashCloseInfo.getJSONObject(j);
-            if (paymentMethod.getString("paymentTypeId").equals(
-                payment.getString("paymentMethodId"))) {
+            if (paymentMethod.getString("paymentType").equals(payment.getString("paymentMethodId"))) {
               payment.put("amountToKeep",
                   paymentMethod.getJSONObject("paymentMethod").getString("amountToKeep"));
             }
diff --git a/web/org.openbravo.retail.posterminal/js/closecash/model/cashup-model.js b/web/org.openbravo.retail.posterminal/js/closecash/model/cashup-model.js
--- a/web/org.openbravo.retail.posterminal/js/closecash/model/cashup-model.js
+++ b/web/org.openbravo.retail.posterminal/js/closecash/model/cashup-model.js
@@ -469,11 +469,11 @@
           var cashCloseInfo = {
             expected: 0,
             difference: 0,
-            paymentTypeId: 0,
+            paymentType: 0,
             paymentMethod: {}
           };
           // Set cashclose info
-          cashCloseInfo.paymentTypeId = curModel.get('id');
+          cashCloseInfo.paymentType = curModel.get('id');
           cashCloseInfo.difference = curModel.get('difference');
           cashCloseInfo.foreignDifference = curModel.get('foreignDifference');
           cashCloseInfo.expected = curModel.get('expected');
diff --git a/web/org.openbravo.retail.posterminal/js/closecash/model/daycash.js b/web/org.openbravo.retail.posterminal/js/closecash/model/daycash.js
--- a/web/org.openbravo.retail.posterminal/js/closecash/model/daycash.js
+++ b/web/org.openbravo.retail.posterminal/js/closecash/model/daycash.js
@@ -35,7 +35,7 @@
 
       _.forEach(jsonpayment, function (item) {
         item.difference = item.counted - item.expected;
-        item.paymentTypeId = item.id;
+        item.paymentType = item.id;
 
         delete item.id;
         delete item.name;
diff --git a/web/org.openbravo.retail.posterminal/js/utils/cashUpReportUtils.js b/web/org.openbravo.retail.posterminal/js/utils/cashUpReportUtils.js
--- a/web/org.openbravo.retail.posterminal/js/utils/cashUpReportUtils.js
+++ b/web/org.openbravo.retail.posterminal/js/utils/cashUpReportUtils.js
@@ -302,10 +302,10 @@
       }
       if (lastCashUpPayments) {
         pAux = lastCashUpPayments.filter(function (payMthd) {
-          return payMthd.paymentTypeId === payment.payment.id;
+          return payMthd.paymentType === payment.payment.id;
         })[0];
         if (!OB.UTIL.isNullOrUndefined(pAux)) {
-          startingCash = pAux.paymentMethod.amountToKeep;
+          startingCash = pAux.paymentMethod ? pAux.paymentMethod.amountToKeep : pAux.amountToKeep;
         }
       }