diff --git a/rero_ils/modules/loans/cli.py b/rero_ils/modules/loans/cli.py index c19c7cb166..f4e198b285 100644 --- a/rero_ils/modules/loans/cli.py +++ b/rero_ils/modules/loans/cli.py @@ -454,7 +454,6 @@ def create_payment_record(patron_transaction, user_pid, user_library): } data['type'] = 'payment' data['subtype'] = 'cash' - data['status'] = 'open' data['amount'] = patron_transaction.get('total_amount') data['creation_date'] = datetime.now(timezone.utc).isoformat() return data diff --git a/rero_ils/modules/patron_transaction_events/api.py b/rero_ils/modules/patron_transaction_events/api.py index e7be8fadb6..ea0d7f862b 100644 --- a/rero_ils/modules/patron_transaction_events/api.py +++ b/rero_ils/modules/patron_transaction_events/api.py @@ -97,7 +97,7 @@ def create_event_from_patron_transaction( data['subtype'] = 'overdue' elif patron_transaction.get('type') == 'subscription': data['subtype'] = 'other' - data['data'] = _('Initial charge') + data['note'] = _('Initial charge') record = cls.create( data, dbcommit=dbcommit, diff --git a/rero_ils/modules/patron_transaction_events/jsonschemas/patron_transaction_events/patron_transaction_event-v0.0.1.json b/rero_ils/modules/patron_transaction_events/jsonschemas/patron_transaction_events/patron_transaction_event-v0.0.1.json index 2b86e3818a..4f29c32e95 100644 --- a/rero_ils/modules/patron_transaction_events/jsonschemas/patron_transaction_events/patron_transaction_event-v0.0.1.json +++ b/rero_ils/modules/patron_transaction_events/jsonschemas/patron_transaction_events/patron_transaction_event-v0.0.1.json @@ -3,6 +3,7 @@ "type": "object", "title": "Patron transaction event", "description": "JSON schema for patron transaction event.", + "additionalProperties": false, "required": [ "$schema", "pid", diff --git a/rero_ils/modules/patron_transaction_events/mappings/v6/patron_transaction_events/patron_transaction_event-v0.0.1.json b/rero_ils/modules/patron_transaction_events/mappings/v6/patron_transaction_events/patron_transaction_event-v0.0.1.json index d073f7eb42..b5a7f2c742 100644 --- a/rero_ils/modules/patron_transaction_events/mappings/v6/patron_transaction_events/patron_transaction_event-v0.0.1.json +++ b/rero_ils/modules/patron_transaction_events/mappings/v6/patron_transaction_events/patron_transaction_event-v0.0.1.json @@ -59,6 +59,13 @@ } } }, + "organisation": { + "properties": { + "pid": { + "type": "keyword" + } + } + }, "_created": { "type": "date" }, diff --git a/tests/data/data.json b/tests/data/data.json index 167049bc5c..41c97ab58e 100644 --- a/tests/data/data.json +++ b/tests/data/data.json @@ -2390,7 +2390,6 @@ }, "operator": { "$ref": "https://ils.rero.ch/api/patrons/ptrn1" - }, - "status": "open" + } } -} \ No newline at end of file +}