EP-2378 Require amount to be submitted for recurring self-service

src/app/profile/yourGiving/editRecurringGifts/step1/editRecurringGifts.component.js

@@ -5,6 +5,7 @@ import giftListItem from 'common/components/giftViews/giftListItem/giftListItem.
 import giftUpdateView from 'common/components/giftViews/giftUpdateView/giftUpdateView.component'
 
 import donationsService from 'common/services/api/donations.service'
+import { allGiftsValid } from 'common/services/giftHelpers/giftValidator.service'
 
 import template from './editRecurringGifts.tpl.html'
 
@@ -38,8 +39,8 @@ class EditRecurringGiftsController {
     }
   }
 
-  allPaymentMethodsValid () {
-    return every(this.recurringGifts, gift => gift.paymentMethod)
+  allGiftsValid () {
+    return allGiftsValid(this.recurringGifts)
   }
 }
 

src/app/profile/yourGiving/editRecurringGifts/step1/editRecurringGifts.component.spec.js

@@ -50,26 +50,10 @@ describe('editRecurringGiftsModal', () => {
       })
     })
 
-    describe('allPaymentMethodsValid', () => {
-      beforeEach(() => {
-        RecurringGiftModel.paymentMethods = [
-          {
-            self: { uri: '/selfservicepaymentinstruments/crugive/giydgnrxgm=' }
-          }
-        ]
-      })
-
-      it('should return true if all payment methods are valid', () => {
-        self.controller.recurringGifts = [new RecurringGiftModel({}).setDefaults(), new RecurringGiftModel({}).setDefaults()]
-
-        expect(self.controller.allPaymentMethodsValid()).toEqual(true)
-      })
-
-      it('should return false if any payment methods is invalid', () => {
-        self.controller.recurringGifts = [new RecurringGiftModel({}).setDefaults(), new RecurringGiftModel({}).setDefaults()]
-        self.controller.recurringGifts[0].paymentMethodId = 'something invalid'
-
-        expect(self.controller.allPaymentMethodsValid()).toEqual(false)
+    describe('allGiftsValid', () => {
+      it('should call the GiftValidator service', () => {
+        self.controller.allGiftsValid()
+        expect(allGiftsValid).toHaveBeenCalled()
       })
     })
   })

src/app/profile/yourGiving/editRecurringGifts/step1/editRecurringGifts.tpl.html

@@ -51,7 +51,7 @@ <h3 translate>Make changes to your recurring gifts</h3>
     <a class="btn btn-primary" ng-if="$ctrl.loadingError" ng-click="$ctrl.loadGifts()" translate>Retry</a>
     <a class="btn btn-primary" ng-if="!$ctrl.loadingError"
        ng-click="$ctrl.next({ recurringGifts: $ctrl.recurringGifts })"
-       ng-disabled="!$ctrl.allPaymentMethodsValid()"
+       ng-disabled="!$ctrl.allGiftsValid()"
        translate>
       Continue
     </a>

src/app/profile/yourGiving/editRecurringGifts/step3/configureRecentRecipients.component.js

@@ -3,13 +3,18 @@ import angular from 'angular'
 import giftListItem from 'common/components/giftViews/giftListItem/giftListItem.component'
 import giftUpdateView from 'common/components/giftViews/giftUpdateView/giftUpdateView.component'
 
+import { allGiftsValid } from 'common/services/giftHelpers/giftValidator.service'
 import template from './configureRecentRecipients.tpl.html'
 
 const componentName = 'step3ConfigureRecentRecipients'
 
 class ConfigureRecentRecipientsController {
   /* @ngInject */
   constructor () /* eslint-disable-line no-useless-constructor */ {}
+
+  allGiftsValid () {
+    return allGiftsValid(//Somehow I need to get access to the recurring gifts here??)
+  }
 }
 
 export default angular

src/app/profile/yourGiving/editRecurringGifts/step3/configureRecentRecipients.tpl.html

@@ -37,6 +37,9 @@ <h3 translate>Set up your new recurring gifts</h3>
     </a>
   </div>
   <div class="col-xs-6 text-right">
-    <button class="btn btn-primary" ng-click="$ctrl.next({ additions: $ctrl.additions })" translate>Continue</button>
+    <button class="btn btn-primary" 
+      ng-click="$ctrl.next({ additions: $ctrl.additions })"
+      ng-disabled="!$ctrl.allGiftsValid()"
+      translate>Continue</button>
   </div>
 </div>

src/common/services/giftHelpers/giftValidator.service.js

@@ -0,0 +1,5 @@
+
+export function allGiftsValid (recurringGifts) {
+    return every(recurringGifts, gift => gift.paymentMethod) && every(recurringGifts, gift => gift.amount)
+  }
+

src/common/services/giftHelpers/giftValidator.service.spec.js

@@ -0,0 +1,30 @@
+
+import * as giftValidator from './giftValidator.service'
+import RecurringGiftModel from 'common/models/recurringGift.model'
+
+describe('giftValidator service', () => {
+
+  describe('allGiftsValid', () => {
+    beforeEach(() => {
+      RecurringGiftModel.amount = 50
+      recurringGifts = [new RecurringGiftModel({}).setDefaults(), new RecurringGiftModel({}).setDefaults()]
+    })
+
+      it('should return true if all payment methods and all amounts are valid', () => {
+        expect(giftValidator.allGiftsValid(recurringGifts)).toEqual(true)
+      })
+
+      it('should return false if any payment method is invalid', () => {
+
+        recurringGifts[0].paymentMethodId = 'something invalid'
+
+        expect(giftValidator.allGiftsValid(recurringGifts)).toEqual(false)
+      })
+
+      it('should return false if any amount is invalid', () => {
+        recurringGifts[0].amount = ''
+
+        expect(giftValidator.allGiftsValid(recurringGifts)).toEqual(false)
+      })
+    })
+})