Add request session to limits - refs BT#9092

plugin/advanced_subscription/src/AdvancedSubscriptionPlugin.php

@@ -250,6 +250,14 @@ class AdvancedSubscriptionPlugin extends Plugin implements HookPluginInterface
             }
         }
 
+        if (isset($params['sessionId'])) {
+            $costField = $extra->get_values_by_handler_and_field_variable($params['sessionId'], 'cost');
+            $uitUser += $costField['field_value'];
+
+            $teachingHoursField = $extra->get_values_by_handler_and_field_variable($params['sessionId'], 'teaching_hours');
+            $expendedTime += $teachingHoursField['field_value'];
+        }
+
         if ($uitMax <= $uitUser) {
             $errorMessage = sprintf(
                 $this->get_lang('AdvancedSubscriptionCostXLimitReached'),

plugin/advanced_subscription/src/terms_and_conditions.php

@@ -24,14 +24,7 @@ $data['termsRejected'] = isset($_REQUEST['r']) ? intval($_REQUEST['r']) : 0;
 // Init template
 $tpl = new Template($plugin->get_lang('plugin_title'));
 
-$isAllowToDoRequest = $plugin->isAllowedToDoRequest(
+$isAllowToDoRequest = $plugin->isAllowedToDoRequest( $data['studentUserId'], $data, true);
-    $data['studentUserId'],
-    array(
-        'is_connected' => $data['is_connected'],
-        'profile_completed' => $data['profile_completed']
-    ),
-    true
-);
 
 if (!$isAllowToDoRequest) {
     $tpl->assign('errorMessages', $plugin->getErrorMessages());