[incomplete] checkout flow improvement

2 files changed, 18 insertions, 81 deletions

diff --git a/ufund-ui/src/app/components/funding-basket/funding-basket.component.html b/ufund-ui/src/app/components/funding-basket/funding-basket.component.html
index 52b35c1..bba66a3 100644
--- a/ufund-ui/src/app/components/funding-basket/funding-basket.component.html
+++ b/ufund-ui/src/app/components/funding-basket/funding-basket.component.html
@@ -1,36 +1,3 @@
-
-<!--<div id="needCount">-->
-<!--    <label for="needCount">Needs in Basket:</label>-->
-<!--    <span>{{ this.usersService.getBasket().getValue().length }}</span>-->
-<!--</div>-->
-
-<!--<div *ngIf="this.usersService.getBasket().getValue().length == 0">-->
-<!--    <h2>There are no needs in the basket</h2>-->
-<!--</div>-->
-
-<!--<table class="needs" id="funding-basket" *ngIf="this.usersService.getBasket().getValue().length != 0">-->
-<!--    <thead>-->
-<!--        <tr>-->
-<!--            <th class="need"></th>-->
-<!--        </tr>-->
-<!--    </thead>-->
-<!--    <tbody>-->
-<!--        <tr *ngFor="let need of usersService.getBasket().getValue()">-->
-<!--            <td>-->
-<!--                <a routerLink="/need/{{need.id}}">{{need.name}}</a>-->
-<!--                <p>Goal: {{need.maxGoal}}</p>-->
-<!--                <p>Current: {{(need.current).toFixed(2)}}</p>-->
-<!--                <p>How much to Contribute: <input type="number" placeholder="insert value" min="1" id={{need.id}} class="contribution"></p>-->
-<!--                <br>-->
-<!--                <div>-->
-<!--                    <button type="button" class="removeNeed" title="delete need"-->
-<!--                    (click)="this.usersService.removeNeed(need.id)">Remove Need</button>-->
-<!--                </div>-->
-<!--            </td>-->
-<!--        </tr>-->
-<!--    </tbody>-->
-<!--</table>-->
-<!--<br>-->
 <div id="box">
     <h1>Funding Basket</h1>
     <ng-template [ngIf]="usersService.getBasket().getValue().length">
@@ -56,14 +23,10 @@
                         <span>{{need.current}}/{{need.maxGoal}} ({{((need.current / need.maxGoal) * 100).toFixed(0)}}%)</span>
                         <progress [value]="need.current" [max]="need.maxGoal"></progress>
                     </div>
-
-                    <!--            <div class="description">-->
-                    <!--                {{need.description}}-->
-                    <!--            </div>-->
                 </div>
 
                 <div class="actionArea">
-                    <input type="number" placeholder="Quantity" min="1" id={{need.id}} class="contribution">
+                    <input type="number" placeholder="Quantity" min="1" [id]="need.id" class="contribution" (input)="resetColor($event)">
                     <button class="removeNeed" title="delete need" (click)="this.usersService.removeNeed(need.id)">
                         <span class="icon">delete</span> Remove from Basket
                     </button>
diff --git a/ufund-ui/src/app/components/funding-basket/funding-basket.component.ts b/ufund-ui/src/app/components/funding-basket/funding-basket.component.ts
index 847baee..18bb9b8 100644
--- a/ufund-ui/src/app/components/funding-basket/funding-basket.component.ts
+++ b/ufund-ui/src/app/components/funding-basket/funding-basket.component.ts
@@ -23,7 +23,6 @@ export class FundingBasketComponent implements OnInit {
     ) {}
 
     @ViewChild("contribution") contribution?: Input;
-    @Input() isValid: boolean = true;
 
     // this is for login rerouting
     ngOnInit(): void {
@@ -37,58 +36,33 @@ export class FundingBasketComponent implements OnInit {
     }
 
     async checkout() {
-        this.isValid = true;
-        for (let c of document.querySelectorAll('.contribution')!) {
-            let contribution = c as HTMLInputElement;
-            contribution.setAttribute("style", "");
-            if (contribution.value == '' || contribution.valueAsNumber <= 0) {
-                this.isValid = false;
+        let order: { id: number, quantity: number }[] = []
 
+        for (let contribution of document.querySelectorAll<HTMLInputElement>('.contribution')!) {
+            if (contribution.value == '' || contribution.valueAsNumber <= 0) {
                 contribution.setAttribute("style", "border-color: #ff0000");
                 this.toastService.sendToast(ToastType.ERROR, "Invalid input in funding basket!")
-
-                setTimeout(() => {
-                    contribution.setAttribute("style", "border-color: #ffffff");
-                }, 3000);
+                return;
             }
+            order.push({id: +contribution.id, quantity: contribution.valueAsNumber});
         }
-        // if (this.usersService.getBasket().value != await firstValueFrom(this.usersService.getUser(1))
-        // for (let c of this.usersService.getBasket().value) {
-        //     if (c == null) {
-        //         this.isValid = false;
-        //         this.statusText.next("One or more needs have been deleted")
-        //     } else {
-        //         this.statusText.next("test")
-        //     }
-        // }
-        if (this.isValid) {
-            for (let c of document.querySelectorAll('.contribution')!) {
-                let contribution = c as HTMLInputElement;
+
+        for (let c of document.querySelectorAll('.contribution')!) {
+            let contribution = c as HTMLInputElement;
+            try {
                 let need = await firstValueFrom(this.cupboardService.getNeed(+contribution.id));
+                await firstValueFrom(this.cupboardService.checkoutNeed(need.id, +contribution.value));
                 need.current += +contribution.value;
                 this.usersService.removeNeed(+need.id);
-                this.cupboardService.checkoutNeed(need.id, +contribution.value)
-                    .pipe(catchError((ex, _) => {
-                        if (ex.status == 500) {
-                            this.toastService.sendToast(ToastType.ERROR, 'Fields cannot be blank');
-                        } else if (ex.status == 400) {
-                            this.toastService.sendToast(ToastType.ERROR, ex.error);
-                        } else {
-                            this.toastService.sendToast(ToastType.ERROR, 'Error on creating need');
-                        }
-                        return new Observable<string>();
-                    }))
-                    .subscribe((result) => {
-                        if (result) {
-                            //this.needList?.refresh()
-                        } else {
-                            console.log('need update failed');
-                        }
-                        this.toastService.sendToast(ToastType.INFO, "Checkout successful");
-                    });
+                this.toastService.sendToast(ToastType.INFO, "Checkout successful");
+            } catch (ex: any) {
+                this.toastService.sendToast(ToastType.ERROR, ex.error);
             }
         }
     }
 
-
+    resetColor(ev: any) {
+        console.log(ev);
+        (ev.target as HTMLInputElement).setAttribute("style", "border-color: unset")
+    }
 }