slapos_subscription_request: cancel existing subscription request if a new...

slapos_subscription_request: cancel existing subscription request if a new trade condition is detected

Do not crash if subscription could not be created anymore

master/bt5/slapos_subscription_request/SkinTemplateItem/portal_skins/slapos_subscription_request/SubscriptionRequest_validateIfSubmitted.py

@@ -51,8 +51,46 @@ if 0 < total_price:
 
   # XXX what is the guarantee deposit account_type?
   if balance < total_price:
-    return markHistory(subscription_request,
-                      'Your user does not have enough deposit.')
+    markHistory(subscription_request,
+                'Your user does not have enough deposit.')
+
+    # Check if a new trade condition has been created to
+    # replace the existing one
+    # (customer's service paid by an organisation)
+    if item.getPortalType() == 'Project':
+      project = item
+    else:
+      project = subscription_request.getSourceProjectValue()
+
+    try:
+      subscription_change_request = subscription_request.getResourceValue().Resource_createSubscriptionRequest(
+        subscription_request.getDestinationValue(),
+        # [software_type, software_release],
+        subscription_request.getVariationCategoryList(),
+        project,
+        currency_value=subscription_request.getPriceCurrencyValue(),
+        temp_object=True,
+        item_value=item,
+        causality_value=subscription_request.getCausalityValue()
+      )
+    except AssertionError:
+      pass
+    else:
+      if subscription_change_request.getSpecialise() != subscription_request.getSpecialise():
+        # We have a matching Trade Condition.
+        # We can recreate the Subscription Request
+        subscription_change_request = subscription_request.getResourceValue().Resource_createSubscriptionRequest(
+          subscription_request.getDestinationValue(),
+          # [software_type, software_release],
+          subscription_request.getVariationCategoryList(),
+          project,
+          currency_value=subscription_request.getPriceCurrencyValue(),
+          item_value=item,
+          causality_value=subscription_request.getCausalityValue()
+        )
+        subscription_request.cancel(comment='Replaced by %s' % subscription_change_request.getReference())
+
+    return
 
 if subscription_request.checkConsistency():
   return markHistory(subscription_request,

master/bt5/slapos_subscription_request/WorkflowTemplateItem/portal_workflow/slapos_subscription_request_interaction_workflow/interaction_SaleTradeCondition_validate.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="Interaction Workflow Interaction" module="erp5.portal_type"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>categories</string> </key>
+            <value>
+              <tuple>
+                <string>after_script/portal_workflow/slapos_subscription_request_interaction_workflow/script_Base_triggerValidationAlarm</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>interaction_SaleTradeCondition_validate</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type</string> </key>
+            <value> <string>Interaction Workflow Interaction</string> </value>
+        </item>
+        <item>
+            <key> <string>portal_type_filter</string> </key>
+            <value>
+              <tuple>
+                <string>Sale Trade Condition</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>portal_type_group_filter</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>temporary_document_disallowed</string> </key>
+            <value> <int>1</int> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>trigger_method_id</string> </key>
+            <value>
+              <tuple>
+                <string>validate</string>
+              </tuple>
+            </value>
+        </item>
+        <item>
+            <key> <string>trigger_once_per_transaction</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>trigger_type</string> </key>
+            <value> <int>2</int> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>