Fix : setupSubScription & BillingForm & setupOrganizationForm

client/src/containers/Setup/SetupOrganizationForm.js

@@ -26,10 +26,7 @@ import withOrganizationActions from 'containers/Organization/withOrganizationAct
 
 import { compose, optionsMapToArray } from 'utils';
 
-function SetupOrganizationForm({
-  requestSubmitOptions,
-  requestSeedTenant
-}) {
+function SetupOrganizationForm({ requestSubmitOptions, requestSeedTenant }) {
   const { formatMessage } = useIntl();
   const [selected, setSelected] = useState();
   const history = useHistory();
@@ -180,11 +177,10 @@ function SetupOrganizationForm({
       const options = optionsMapToArray(values).map((option) => {
         return { key: option.key, ...option, group: 'organization' };
       });
+      console.log(options, 'Op');
       requestSubmitOptions({ options })
         .then((response) => {
-          requestSeedTenant().then(() => {
-            setSubmitting(false);
-          });
+          setSubmitting(false);
         })
         .catch((erros) => {
           setSubmitting(false);
@@ -306,8 +302,7 @@ function SetupOrganizationForm({
                 itemPredicate={filterItems}
                 selectedItem={values.base_currency}
                 selectedItemProp={'value'}
-                // defaultText={<T id={'select_base_currency'} />}
-                defaultText={'LYD - Libyan Dinar'}
+                defaultText={<T id={'select_base_currency'} />}
                 labelProp={'name'}
               />
             </FormGroup>
@@ -337,8 +332,7 @@ function SetupOrganizationForm({
                 itemPredicate={filterItems}
                 selectedItem={values.language}
                 selectedItemProp={'value'}
-                defaultText={'English'}
-                // defaultText={<T id={'select_language'} />}
+                defaultText={<T id={'select_language'} />}
                 labelProp={'name'}
               />
             </FormGroup>
@@ -367,8 +361,7 @@ function SetupOrganizationForm({
             itemPredicate={filterItems}
             selectedItem={values.fiscal_year}
             selectedItemProp={'value'}
-            defaultText={'January - December'}
-            // defaultText={<T id={'select_fiscal_year'} />}
+            defaultText={<T id={'select_fiscal_year'} />}
             labelProp={'name'}
           />
         </FormGroup>
@@ -407,7 +400,7 @@ function SetupOrganizationForm({
             intent={Intent.PRIMARY}
             loading={isSubmitting}
             type="submit"
-            //  loading={isSubmitting}
+            loading={isSubmitting}
           >
             <T id={'save_continue'} />
           </Button>

client/src/containers/Setup/SetupSubscriptionForm.js

@@ -1,33 +1,61 @@
 import React, { useMemo } from 'react';
 import * as Yup from 'yup';
 import { useFormik } from 'formik';
-import { FormattedMessage as T } from 'react-intl';
+import { FormattedMessage as T, useIntl } from 'react-intl';
 import { Button, Intent } from '@blueprintjs/core';
-import BillingTab from 'containers/Subscriptions/BillingTab';
+import BillingPlans from 'containers/Subscriptions/billingPlans';
+import BillingPeriods from 'containers/Subscriptions/billingPeriods';
+import { BillingPaymentmethod } from 'containers/Subscriptions/billingPaymentmethod';
+
+import withBillingActions from 'containers/Subscriptions/withBillingActions';
+import { compose } from 'utils';
 
 /**
  * Subscription step of wizard setup.
  */
-export default function SetupSubscriptionForm({
-
+function SetupSubscriptionForm({
+  //#withBillingActions
+  requestSubmitBilling,
 }) {
-  const ValidationSchema = Yup.object().shape({});
+  const { formatMessage } = useIntl();
 
-  const initialValues = useMemo(() => ({}), []);
+  const validationSchema = Yup.object().shape({
+    plan_slug: Yup.string()
+      .required()
+      .label(formatMessage({ id: 'plan_slug' })),
+    license_code: Yup.string().trim(),
+  });
+
+  const initialValues = useMemo(
+    () => ({
+      plan_slug: '',
+      license_code: '',
+    }),
+    [],
+  );
 
   const formik = useFormik({
     enableReinitialize: true,
-    validationSchema: ValidationSchema,
+    validationSchema: validationSchema,
     initialValues: {
       ...initialValues,
     },
-    onSubmit: (values, { setSubmitting, setErrors }) => {},
+    onSubmit: (values, { setSubmitting, setErrors }) => {
+      requestSubmitBilling(values)
+        .then((response) => {
+          setSubmitting(false);
+        })
+        .catch((errors) => {
+          setSubmitting(false);
+        });
+    },
   });
   return (
     <div className={'register-subscription-form'}>
-      <form className={'billing-form'}>
-        <BillingTab formik={formik} />
-
+      <form onSubmit={formik.handleSubmit} className={'billing-form'}>
+        <BillingPlans title={'a_select_a_plan'} formik={formik} />
+        <BillingPeriods title={'b_choose_your_billing'} formik={formik} />
+        <BillingPaymentmethod title={'c_payment_methods'} formik={formik} />
         <div className={'subscribe-button'}>
           <Button
             intent={Intent.PRIMARY}
@@ -41,3 +69,5 @@ export default function SetupSubscriptionForm({
     </div>
   );
 }
+
+export default compose(withBillingActions)(SetupSubscriptionForm);