From 5868c6210c0ab84387c7827a133a793c1b84f279 Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Sat, 8 Sep 2018 20:04:50 +0530
Subject: [PATCH] Merge branch 'master' of
 https://bitbucket.org/venbainformationtechnology/apollodec

# Conflicts:
#	Apollo/api/application/config/routes.php
#	Apollo/api/application/controllers/Receive_Enrolment_Fees_Univ_Controller.php
#	Apollo/api/application/models/Receive_Enrolment_Fees_Univ_model.php
---
 .../student/addUniversityPaymentModal.html    | 103 ++++++++++++++++++
 1 file changed, 103 insertions(+)
 create mode 100644 Apollo/assets/views/student/addUniversityPaymentModal.html

diff --git a/Apollo/assets/views/student/addUniversityPaymentModal.html b/Apollo/assets/views/student/addUniversityPaymentModal.html
new file mode 100644
index 00000000..4e13181a
--- /dev/null
+++ b/Apollo/assets/views/student/addUniversityPaymentModal.html
@@ -0,0 +1,103 @@
+<div class="container-fluid container-fullw bg-white">
+        <fieldset>
+
+            <legend>Payment for : {{addPaymentModel.university.univName}}</legend>
+            <form name="FormPayment" id="form" novalidate>
+            <div class="row">
+                <div class="col-md-4 form-group"
+                     ng-class="{'has-error':FormPayment.billno.$dirty && FormPayment.billno.$invalid, 'has-success':FormPayment.billno.$valid}">
+                    <label>
+                        Bill No <span
+                            class="symbol required"></span>
+                    </label>
+
+                    <input type="text"  placeholder="Enter Bill No"
+                           tabindex="1" class="form-control" name="billno"
+                           ng-model="addPaymentModel.billNo" capitalize disallow-spaces required/>
+                    <span class="error text-small block"
+                          ng-if="FormPayment.billno.$dirty && FormPayment.billno.$error.required">Bill no is required</span>
+                </div>
+                <div class="col-md-4 form-group"
+                     ng-class="{'has-error':FormPayment.billAmount.$dirty && FormPayment.billAmount.$invalid,'has-success':FormPayment.billAmount.$valid}">
+                    <label>
+                        Bill Amount <span class="symbol required"></span>
+                    </label>
+
+                    <input type="text"  placeholder="Enter Bill Amount"
+                           autofocus tabindex="2" class="form-control" name="billAmount" id="billAmount" ng-maxlength="9"
+                           ng-model="addPaymentModel.billAmount" ng-pattern="/^[0-9]*$/" required/>
+                    <span class="error text-small block"
+                          ng-if="FormPayment.billAmount.$dirty && FormPayment.billAmount.$invalid"
+                          ng-hide="FormPayment.billAmount.$error.maxlength || FormPayment.billAmount.$error.pattern">Bill amount is required</span>
+                    <span class="error text-small block"
+                          ng-if="FormPayment.billAmount.$error.maxlength || FormPayment.billAmount.$error.pattern">Enter a valid amount</span>
+
+                </div>
+                <div data-ng-controller="DatepickerDemoCtrl">
+                    <div class="col-md-4 form-group"
+                         ng-class="{'has-error':FormPayment.date.$dirty && FormPayment.date.$invalid, 'has-success':FormPayment.date.$valid}">
+                        <label>
+                            Bill Date <span
+                                class="symbol required"></span>
+                        </label>
+                        <input type="text"
+                               class="form-control "
+                               ng-click="startOpen = !startOpen"
+                               datepicker-popup="dd-MM-yyyy"
+                               ng-model="addPaymentModel.date"
+                               is-open="startOpen"
+                               ng-init="startOpen = false"
+                               name="date"
+                               datepicker-options="dateOptions"
+                               placeholder="Select Date"
+                               min-date="currentDate"
+                               max-date="futureDate"
+                               close-text="Close" required="required" ng-readonly="true"/>
+                        <span class="error text-small block"
+                              ng-if="FormPayment.date.$dirty && FormPayment.date.$error.required">Date is required.</span>
+                    </div>
+
+                </div>
+            </div>
+                <div class="row">
+                <div class="col-md-4 form-group"
+                     ng-class="{'has-error':FormPayment.receiptNo.$dirty && FormPayment.receiptNo.$invalid}">
+                    <label>
+                        Receipt No
+                    </label>
+
+                    <input type="text"  placeholder="Enter Receipt No"
+                           tabindex="3" class="form-control" name="receiptNo"
+                           ng-model="addPaymentModel.receiptNo" disallow-spaces/>
+                </div>
+                <div class="col-md-8 form-group"
+                     ng-class="{'has-error':FormPayment.comments.$dirty && FormPayment.comments.$invalid}">
+                    <label>
+                        Comments
+                    </label>
+                    <textarea placeholder="Enter Comments" tabindex="4"
+                              class="form-control textdsc" name="comments"
+                              ng-model="addPaymentModel.comments"></textarea>
+                </div>
+
+            </div>
+            <div class="row">
+                <div class="col-md-12">
+                    <div class="pull-right">
+                        <span style="color:red;">{{addError}}</span>
+                        <button type="submit" tabindex="5" class="btn btn-wide btn-success" ng-click="addUnivPayment(FormPayment,addPaymentModel)">
+                            Save
+                        </button>
+
+                        <input type="button" class="btn btn-warning btn-wide" tabindex="6" value="Cancel"
+                               ng-click="cancelAddPaymentModal();">
+
+                        </input>
+                    </div>
+                </div>
+            </div>
+
+            </form>
+        </fieldset>
+
+</div>
\ No newline at end of file