Merge branch 'dev' for release 6.3.39

sleede · Feb 3, 2025 · 041e579 · 041e579
2 parents ee5741a + c7a222e
commit 041e579
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Next release
 
+## v6.3.39 2025 February 3
+
+- Fix a bug: unable to cancel a PayZen subscription
+
 ## v6.3.38 2025 January 27
 
 - Fix a bug: unable to update product low stock alert

diff --git a/lib/pay_zen/service.rb b/lib/pay_zen/service.rb
@@ -70,7 +70,8 @@ def cancel_subscription(payment_schedule)
         raise "Cannot cancel transaction #{t['uuid']}" unless tr_res['answer']['detailedStatus'] == 'CANCELLED'
       end
     rescue PayzenError => e
-      raise e unless e.details['errorCode'] == 'PSP_010' # ignore if no order
+      # ignore if no order found and Subscription already canceled.
+      raise e unless e.details['errorCode'] == 'PSP_010' || e.details['errorCode'] == 'PSP_1099'
     end
 
     # then, we cancel the subscription

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fab-manager",
-  "version": "6.3.38",
+  "version": "6.3.39",
   "description": "Fab-manager is the FabLab management solution. It provides a comprehensive, web-based, open-source tool to simplify your administrative tasks and your marker's projects.",
   "keywords": [
     "fablab",