- Fixed issue in Obsidian and webforms RegistrationEntry where single…

… required fees were not being required. (Fixes #5464)
SparkDevNetwork · Jun 7, 2023 · fa892cf · fa892cf
1 parent 83fa2e0
commit fa892cf
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/Rock.JavaScript.Obsidian.Blocks/src/Event/RegistrationEntry/feeField.partial.ts b/Rock.JavaScript.Obsidian.Blocks/src/Event/RegistrationEntry/feeField.partial.ts
@@ -49,7 +49,8 @@ export default defineComponent({
     data() {
         return {
             dropDownValue: "",
-            checkboxValue: false
+            checkboxValue: false,
+            disabled: false
         };
     },
     methods: {
@@ -110,6 +111,9 @@ export default defineComponent({
         },
         rules(): string {
             return this.fee.isRequired ? "required" : "";
+        },
+        isDisabled(): string | undefined {
+            return this.disabled ? "disabled" : undefined;
         }
     },
     watch: {
@@ -138,6 +142,21 @@ export default defineComponent({
                 if (this.isCheckbox && this.singleItem) {
                     this.checkboxValue = !!this.modelValue[this.singleItem.guid];
                     this.modelValue[this.singleItem.guid] = this.checkboxValue ? 1 : 0;
+
+                    // If the fee is required and available then select and disable the checkbox
+                    if (this.fee.isRequired && (this.fee.items[0].countRemaining === null || this.fee.items[0].countRemaining > 0)) {
+                        this.checkboxValue = true;
+                        this.modelValue[this.singleItem.guid] = this.checkboxValue ? 1 : 0;
+                        this.disabled = true;
+                    }
+
+                    // If the fee is not required and used up then disable the checkbox.
+                    if (this.fee.items[0].countRemaining !== null && this.fee.items[0].countRemaining <= 0) {
+                        // If the checkbox is already checked then leave it checked in case this form is being revisited.
+                        this.checkboxValue = this.checkboxValue ? this.checkboxValue : false;
+                        this.modelValue[this.singleItem.guid] = this.checkboxValue ? 1 : 0;
+                        this.disabled = true;
+                    }
                 }
             }
         },
@@ -165,7 +184,7 @@ export default defineComponent({
     },
     template: `
 <template v-if="!isHidden">
-    <CheckBox v-if="isCheckbox" :label="label" v-model="checkboxValue" :rules="rules" />
+    <CheckBox v-if="isCheckbox" :label="label" v-model="checkboxValue" :rules="rules" :disabled="isDisabled" />
     <NumberUpDown v-else-if="isNumberUpDown" :label="label" :min="0" :max="singleItem.countRemaining || 100" v-model="modelValue[singleItem.guid]" :rules="rules" />
     <DropDownList v-else-if="isDropDown" :label="label" :items="dropDownListOptions" v-model="dropDownValue" :rules="rules" formControlClasses="input-width-md" />
     <NumberUpDownGroup v-else-if="isNumberUpDownGroup" :label="label" :options="numberUpDownGroupOptions" v-model="modelValue" :rules="rules" />

diff --git a/Rock/Model/Event/RegistrationTemplateFee/RegistrationTemplateFee.WebForms.cs b/Rock/Model/Event/RegistrationTemplateFee/RegistrationTemplateFee.WebForms.cs
@@ -47,7 +47,7 @@ private Control GetFeeSingleOptionSingleQuantityControl( bool setValues, string
 
             var currentValue = feeValues?.FirstOrDefault()?.Quantity ?? 0;
 
-            if ( fee.IsRequired && usageCountRemaining > 0 )
+            if ( fee.IsRequired && ( !usageCountRemaining.HasValue || usageCountRemaining > 0 ) )
             {
                 cb.Checked = true;
                 cb.Enabled = false;