LP1904036 CC dialog repairs

Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Jane Sandberg <js7389@princeton.edu>
Signed-off-by: Galen Charlton <gmc@equinoxOLI.org>

diff --git a/Open-ILS/src/eg2/src/app/staff/share/billing/credit-card-dialog.component.html b/Open-ILS/src/eg2/src/app/staff/share/billing/credit-card-dialog.component.html
index 9176a4f..d54eff2 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/share/billing/credit-card-dialog.component.html
+++ b/Open-ILS/src/eg2/src/app/staff/share/billing/credit-card-dialog.component.html
@@ -26,10 +26,10 @@
         </div>
         <ng-container *ngIf="args.where_process == 1">
           <div class="row mt-2">
-            <div class="col-lg-4"><label i18n>Approval Code</label></div>
+            <div class="col-lg-4"><label i18n>Credit Card Number</label></div>
             <div class="col-lg-8">
               <input type="text" class="form-control" 
-                required [(ngModel)]="args.approval_code"/>
+                required [(ngModel)]="args.number"/>
             </div>
           </div>
         </ng-container>
@@ -48,6 +48,13 @@
                 required [(ngModel)]="args.expire_year"/>
             </div>
           </div>
+          <div class="row mt-2">
+            <div class="col-lg-4"><label i18n>Approval Code</label></div>
+            <div class="col-lg-8">
+              <input type="text" class="form-control" 
+                required [(ngModel)]="args.approval_code"/>
+            </div>
+          </div>
         </ng-container>
       </div>
     </div>
@@ -108,7 +115,7 @@
   </div>
   <div class="modal-footer">
     <button type="button" class="btn btn-success" [disabled]="!saveable()"
-      (click)="submit(args)" i18n>Submit</button>
+      (click)="close(args)" i18n>Submit</button>
     <button type="button" class="btn btn-warning"
       (click)="close()" i18n>Cancel</button>
   </div>

diff --git a/Open-ILS/src/eg2/src/app/staff/share/billing/credit-card-dialog.component.ts b/Open-ILS/src/eg2/src/app/staff/share/billing/credit-card-dialog.component.ts
index aae5750..512de52 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/share/billing/credit-card-dialog.component.ts
+++ b/Open-ILS/src/eg2/src/app/staff/share/billing/credit-card-dialog.component.ts
@@ -70,6 +70,8 @@ export class CreditCardDialogComponent
                 if (processor && processor !== 'Stripe') {
                     this.supportsExternal = true;
                     this.args.where_process = 1;
+                } else {
+                    this.args.where_process = 0;
                 }
             });
         });
@@ -84,9 +86,5 @@ export class CreditCardDialogComponent
 
         return Boolean(this.args.expire_month) && Boolean(this.args.expire_year);
     }
-
-
-    submit() {
-    }
 }