viithiisys / Acufuel

Download as
Browse Code ยป

Commit 71d4c1059c21585180c23ea38e793be9ac7a2f3f

Authored by Rishav Singla
1 parent 68c767613f
Exists in master

fuel vendor detail page changes

Showing 3 changed files with 6 additions and 28 deletions   Show diff stats
app/partials/viewFuelVendor/viewFuelVendor.controller.js
Diff comments   View file @71d4c10
... ... @@ -154,7 +154,7 @@
154 154 $scope.showAddress = true;
155 155 }
156 156  
157   - var vendorData = "companyName=" + $scope.vendorData.companyName + "&masterMargin=" + $scope.vendorData.masterMargin
  157 + var vendorData = "vendorName=" + $scope.vendorData.vendorName + "&masterMargin=" + $scope.vendorData.masterMargin
158 158 + "&addressOne=" + $scope.vendorData.addressOne + "&addressTwo=" + $scope.vendorData.addressTwo + "&city=" + $scope.vendorData.city + "&state="
159 159 + $scope.vendorData.state + "&country=" + $scope.vendorData.country + "&zipcode=" + $scope.vendorData.zipcode + "&internalNote="
160 160 + $scope.vendorData.internalNote + "&certificateType=" + $scope.vendorData.certificateType + "&baseTenant=" + $scope.vendorData.baseTenant
... ...
app/partials/viewFuelVendor/viewFuelVendor.html
Diff comments   View file @71d4c10
... ... @@ -124,7 +124,7 @@
124 124 <div class="widget">
125 125 <div class="widget-header">
126 126 <i class="fa fa-building-o" aria-hidden="true"></i>
127   - <h3>Antioch Flight Department</h3>
  127 + <h3>{{vendorData.vendorName}}</h3>
128 128 <i class="fa fa-times timess" ui-sref="app.customers" aria-hidden="true"></i>
129 129 </div>
130 130 <!-- /widget-header -->
... ... @@ -135,8 +135,6 @@
135 135 <div class="widget-header">
136 136 <i class="fa fa-building-o" aria-hidden="true"></i>
137 137 <h3>Company Details</h3>
138   - <label>BASE ICAO</label>
139   - <input type="tel" ng-model="vendorData.baseIcao" style="line-height: 18px;width: 50px;padding: 0px 9px;" ng-blur="editData()"/>
140 138 <div class="pull-right" style="margin-top: 5px; margin-right: 10px;">
141 139 <toggle ng-model="vendorData.activate" ng-change="changeCompanyStatus()" size="customToogle" on="Active" off="Dactive"></toggle>
142 140 </div>
... ... @@ -149,41 +147,21 @@
149 147 </h4>
150 148 <input type="tel" ng-hide="showCompanyName" ng-model="vendorData.vendorName" class="form-control" ng-blur="editData('showCompanyName')"/>
151 149 </div>
152   - <div class="col-md-5">
153   - <select class="form-control" style="padding: 4px 8px;background: #ebebeb;" ng-model="vendorData.certificateType" ng-click="editData()">
154   - <option class="optionclass" disabled selected>Certificate Type</option>
155   - <option class="optionclass" value="corporate">Part 91 (Corporate)</option>
156   - <option class="optionclass" value="charter">Part 135 (Charter)</option>
157   - <option class="optionclass" value="scheduled">Part 121 (Scheduled)</option>
158   - <option class="optionclass" value="military">Military</option>
159   - <option class="optionclass" value="government">Government</option>
160   - </select>
161   - </div>
162 150 </div>
163 151 <div>
164 152 <p class="new-label">
165 153 <span>Master Margin Setting </span>
166   - <select class="form-control" style="width: 135px;padding: 4px 8px;" ng-model="vendorData.masterMargin" ng-click="editData()">
  154 + <select class="form-control" style="width: 135px;padding: 4px 8px;" ng-model="vendorData.masterMargin" ng-change="editData()">
167 155 <option value="margin1">Margin1</option>
168 156 <option value="margin2">Margin2</option>
169 157 <option value="vendorsonly">Vendors Only</option>
170 158 <option value="margintenants">Margin Tenants</option>
171 159 </select>
172   - <span>&nbsp;See Aircrart List</span>
  160 + <span>&nbsp;$1.7500</span>
173 161 <div class="clearfix"></div>
174 162 </p>
175 163 </div>
176   - <div class="row" style="margin-left:0px;">
177   - <div class="col-md-5" style="padding-left: 0;">
178   - <input type="checkbox" name="" ng-click="editData()" ng-model="vendorData.baseTenant"> Tenant/Base Customer
179   - </div>
180   - <div class="col-md-5" style="padding-left: 0;">
181   - <input type="checkbox" name="" ng-click="editData()" ng-model="vendorData.fuelerlinxCustomer"> FuelerLinx Customer
182   - </div>
183   - </div>
184   - <div>
185   - <input type="checkbox" name="" ng-click="editData()" ng-model="vendorData.contractFuelVendor"> CAA Member
186   - </div>
  164 +
187 165 </br>
188 166 <div class="new-address">
189 167 <p ng-show="showAddress"><i class="fa fa-map-marker"></i>
... ...
app/partials/viewFuelVendor/viewFuelVendor.service.js
Diff comments   View file @71d4c10
... ... @@ -42,7 +42,7 @@
42 42 var deferred = $q.defer();
43 43 $http({
44 44 method : 'POST',
45   - url : BASE_URL.url +'/vendor/add/contact',
  45 + url : BASE_URL.url +'/vendor/contact',
46 46 data : data,
47 47 headers : {'Content-Type': 'application/json'},
48 48 })
... ...