Commit cee8fcc0 authored by kezzle's avatar kezzle
Browse files

Merge branch 'yec22' into 'main' 

Yec22

See merge request !95
parents 59b8d325 d6878e82

assets/static/gen/donate.js

+3 −2

File changed.

Preview size limit exceeded, changes collapsed.

assets/static/gen/donate.js.map

+1 −1

File changed.

Preview size limit exceeded, changes collapsed.

assets/static/images/donate/yec-metacard.png

+13.7 KiB (56.5 KiB)
Loading image diff...

parcel/js/giving_form.jsx

+5 −3
Original line number Diff line number Diff line
@@ -195,9 +195,9 @@ export function GivingForm(props) { 
        perkData['style-1'] = 'take-back-internet';

      } else if (selectedPerk == 't-shirt-pack'){

        perkData['style-1'] = perkOption;

        perkData['fit-1'] = fitsAndSizes['shirt2Fit'];

        perkData['fit-1'] = 'slim';

        perkData['fit-2'] = fitsAndSizes['shirt1Fit'];

        perkData['size-1'] = fitsAndSizes['shirt2Size'];

        perkData['size-1'] = 's';

        perkData['size-2'] = fitsAndSizes['shirt1Size'];

      } else if (selectedPerk == 'sweatshirt') {

        // This is hardcoded as a small due to a bug in civi
@@ -245,7 +245,9 @@ export function GivingForm(props) { 
    }

    const requiredFitAndSizeFieldNames = requiredFitAndSizeFields();

    for (const fieldName of requiredFitAndSizeFieldNames) {

      if (!validateField(fitsAndSizes, fieldName, isNotBlank)) {

      if (fieldName != 'shirt2Fit' && fieldName != 'shirt2Size' && !validateField(fitsAndSizes, fieldName, isNotBlank)) {

    console.log('HERE');

          console.log(fieldName);

        newErrors.push(new NamedError(fieldName, fieldName + ' must be filled out'));

      }

    }

templates/donate-form.html

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ 
                }

              },

            ],

            'requiredFields': ['shirt1Fit', 'shirt1Size',],

            'requiredFields': ['shirt1Fit', 'shirt1Size', 'shirt2Fit', 'shirt2Size'],

          },

          {

            'name': 'sweatshirt',