feature: specify which goal types are currency

impress-org · Oct 10, 2023 · 5e8217d · 5e8217d
1 parent 6764bcf
commit 5e8217d
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 9 deletions.
diff --git a/src/FormBuilder/ViewModels/FormBuilderViewModel.php b/src/FormBuilder/ViewModels/FormBuilderViewModel.php
@@ -86,12 +86,18 @@ public function isRecurringEnabled(): bool
     /**
      * @since 3.0.0-rc.6
      */
-    public function getGoalTypeOption(string $value, string $label, string $description): array
+    public function getGoalTypeOption(
+        string $value,
+        string $label,
+        string $description,
+        bool $isCurrency = false
+    ): array
     {
         return [
             'value' => $value,
             'label' => $label,
             'description' => $description,
+            'isCurrency' => $isCurrency,
         ];
     }
 
@@ -104,7 +110,8 @@ public function getGoalTypeOptions(): array
             $this->getGoalTypeOption(
                 GoalType::AMOUNT,
                 __('Amount Raised', 'give'),
-                __('The total amount raised for the form', 'give')
+                __('The total amount raised for the form', 'give'),
+                true
             ),
             $this->getGoalTypeOption(
                 GoalType::DONATIONS,
@@ -123,7 +130,8 @@ public function getGoalTypeOptions(): array
                 $this->getGoalTypeOption(
                     GoalType::AMOUNT_FROM_SUBSCRIPTIONS,
                     __('Subscription Amount Raised', 'give'),
-                    __('The total amount raised for the form through subscriptions', 'give')
+                    __('The total amount raised for the form through subscriptions', 'give'),
+                    true
                 ),
                 $this->getGoalTypeOption(
                     GoalType::SUBSCRIPTIONS,

diff --git a/src/FormBuilder/resources/js/form-builder/src/common/getWindowData.ts b/src/FormBuilder/resources/js/form-builder/src/common/getWindowData.ts
@@ -14,6 +14,7 @@ type GoalTypeOption = {
     value: string;
     label: string;
     description: string;
+    isCurrency: boolean;
 };
 
 /**

diff --git a/src/FormBuilder/resources/js/form-builder/src/settings/donation-goal/index.tsx b/src/FormBuilder/resources/js/form-builder/src/settings/donation-goal/index.tsx
@@ -1,6 +1,7 @@
 import {setFormSettings, useFormState, useFormStateDispatch} from '@givewp/form-builder/stores/form-state';
 import {__} from '@wordpress/i18n';
 import {
+    __experimentalNumberControl as NumberControl,
     PanelBody,
     PanelRow,
     SelectControl,
@@ -69,12 +70,21 @@ const DonationGoalSettings = () => {
                         />
                     </PanelRow>
                     <PanelRow>
-                        <CurrencyControl
-                            label={__('Goal Amount', 'give')}
-                            min={0}
-                            value={goalAmount}
-                            onValueChange={debounce((goalAmount) => dispatch(setFormSettings({goalAmount})), 500)}
-                        />
+                        {selectedGoalType.isCurrency ? (
+                            <CurrencyControl
+                                label={__('Goal Amount', 'give')}
+                                min={0}
+                                value={goalAmount}
+                                onValueChange={debounce((goalAmount) => dispatch(setFormSettings({goalAmount})), 500)}
+                            />
+                        ) : (
+                            <NumberControl
+                                label={__('Goal Amount', 'give')}
+                                min={0}
+                                value={goalAmount}
+                                onChange={(goalAmount) => dispatch(setFormSettings({goalAmount}))}
+                            />
+                        )}
                     </PanelRow>
                 </>
             )}