From cdcdff75673770dd6c89cb8bdf71840e17311532 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Thu, 14 Feb 2019 14:58:04 +0100 Subject: [PATCH 1/2] Update Cyclos to 4.11 --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 88eddd5..4ae3401 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -63,7 +63,7 @@ services: - eusko_net cyclos-app: - image: cyclos/cyclos:4.6.2 + image: cyclos/cyclos:4.11 ports: - 8081:8080 environment: From e48c00719f0b2df4f0ad5ee605e9442b48f58a7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Sat, 22 Dec 2018 03:04:06 +0100 Subject: [PATCH 2/2] [FIX] Add new API parameters for Cyclos 4.11 This might break compatibility with older Cyclos versions. --- etc/cyclos/setup.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/etc/cyclos/setup.py b/etc/cyclos/setup.py index 9f77a68..af5aa83 100644 --- a/etc/cyclos/setup.py +++ b/etc/cyclos/setup.py @@ -931,7 +931,8 @@ def create_payment_transfer_type(name, direction, from_account_type_id, to_account_type_id, custom_fields=[], status_flows=[], initial_statuses=[], channels=[ID_CANAL_MAIN_WEB, ID_CANAL_WEB_SERVICES], - principal_types=[]): + principal_types=[], + description_availability="OPTIONAL"): logger.info('Création du type de paiement "%s"...', name) r = requests.post(eusko_web_services + 'transferType/save', headers=headers, @@ -948,6 +949,7 @@ def create_payment_transfer_type(name, direction, from_account_type_id, 'maxChargebackTime': {'amount': '2', 'field': 'MONTHS'}, 'channels': channels, 'principalTypes': principal_types, + 'descriptionAvailability': description_availability, }) check_request_status(r) payment_transfer_type_id = r.json()['result'] @@ -962,7 +964,8 @@ def create_payment_transfer_type(name, direction, from_account_type_id, def create_generated_transfer_type(name, direction, from_account_type_id, - to_account_type_id): + to_account_type_id, + description_availability="OPTIONAL"): logger.info('Création du type de paiement "%s"...', name) r = requests.post(eusko_web_services + 'transferType/save', headers=headers, @@ -973,6 +976,7 @@ def create_generated_transfer_type(name, direction, from_account_type_id, 'direction': direction, 'from': from_account_type_id, 'to': to_account_type_id, + 'descriptionAvailability': description_availability, }) check_request_status(r) generated_transfer_type_id = r.json()['result']