viithiisys / Acufuel

Download as
Browse Code ยป

Commit e196b9b74367284f1f28c72bf641e1ffd47209cb

Authored by Anchit Jindal
1 parent 07328f4420
Exists in master

new changes added

Showing 17 changed files with 386 additions and 40 deletions   Show diff stats
... ... @@ -220,6 +220,25 @@
220 220 authorizedRoles: ["FBO"],
221 221 }
222 222 })
  223 +
  224 + .state("app.flightTracking", {
  225 + url: "/flightTracking",
  226 + templateUrl: "partials/flightTracking/flightTracking.html",
  227 + controller: "flightTrackingController",
  228 + data: {
  229 + authorizedRoles: ["FBO"],
  230 + }
  231 + })
  232 +
  233 + .state("app.taxes", {
  234 + url: "/taxes",
  235 + templateUrl: "partials/taxes/taxes.html",
  236 + controller: "taxesController",
  237 + data: {
  238 + authorizedRoles: ["FBO"],
  239 + }
  240 + })
  241 +
223 242 .state("app.signup", {
224 243 url: "/signup",
225 244 templateUrl: "partials/signup/signup.html",
... ...
app/partials/ContactView/ContactView.controller.js
Diff comments   View file @e196b9b
... ... @@ -5,17 +5,17 @@
5 5  
6 6 .controller('ContactViewController', ['$scope', '$uibModal', 'ContactViewService', 'ViewCompanyService', 'ViewcontactService', 'NgTableParams', function($scope, $uibModal, ContactViewService, ViewCompanyService, ViewcontactService, NgTableParams) {
7 7  
8   - $(document).ready(function() {
  8 + /* $(document).ready(function() {
9 9 $scope.showLoader = true;
10   - $('#contacts').DataTable();
  10 + // $('#contacts').DataTable();
11 11 $scope.showLoader = false;
12   - });
  12 + });*/
13 13  
14   - ContactViewService.getContacts().then(function(result) {
  14 + /* ContactViewService.getContacts().then(function(result) {
15 15 $scope.showLoader = true;
16 16 $scope.contactList = result;
17 17 $scope.showLoader = false;
18   - })
  18 + })*/
19 19  
20 20 $scope.search = "";
21 21 $scope.minlength = 2;
... ... @@ -97,7 +97,7 @@
97 97 ContactViewService.getCompanies().then(function(result) {
98 98 $scope.showLoader = true;
99 99 $scope.companies = result;
100   - $scope.showLoader = true;
  100 + $scope.showLoader = false;
101 101  
102 102 })
103 103  
... ...
app/partials/FuelVendors/FuelVendors.controller.js
Diff comments   View file @e196b9b
... ... @@ -7,11 +7,11 @@
7 7  
8 8 function FuelVendorsController($scope, $rootScope, $uibModal, $filter, $http, FuelVendorsService, CustomersService, ViewFuelVendorService, NgTableParams) {
9 9  
10   - $(document).ready(function() {
  10 + /*$(document).ready(function() {
11 11 $scope.showLoader = true;
12 12 $('#example').DataTable();
13 13 $scope.showLoader = false;
14   - });
  14 + });*/
15 15 $scope.userProfileId = JSON.parse(localStorage.getItem('userProfileId'))
16 16 $scope.reset = function(){
17 17 $("input").val("");
... ... @@ -24,8 +24,8 @@
24 24 getAllVendor();
25 25  
26 26 function getAllVendor(){
  27 + $scope.showLoader = true;
27 28 FuelVendorsService.getAllVendor().then(function(result) {
28   - $scope.showLoader = true;
29 29 console.log(result)
30 30 $scope.companyList = result;
31 31 for (var i = 0; i < $scope.companyList.length; i++) {
... ...
app/partials/customers/customers.html
Diff comments   View file @e196b9b
... ... @@ -82,7 +82,7 @@
82 82 <div class="tabbable">
83 83 <ul class="nav nav-tabs">
84 84 <li class="active">
85   - <a ui-sref="app.customers">Company View
  85 + <a ui-sref="app.customers">Customer View
86 86 <i class="fa fa-caret-down" aria-hidden="true"></i>
87 87 </a>
88 88 </li>
... ...
app/partials/flightTracking/flightTracking.controller.js
Diff comments   View file @e196b9b
... ... @@ -0,0 +1,10 @@
  1 +'use strict';
  2 +
  3 +angular.module('acufuel')
  4 +
  5 +.controller('flightTrackingController', ['$scope','$compile', 'uiCalendarConfig', 'flightTrackingService', function($scope, $compile, uiCalendarConfig, flightTrackingService) {
  6 +
  7 +
  8 +
  9 +}]);
  10 +
... ...
app/partials/flightTracking/flightTracking.html
Diff comments   View file @e196b9b
... ... @@ -0,0 +1,90 @@
  1 +<style>
  2 + .subnavbar .mainnav > li:nth-child(3) > a{
  3 + color: #ff9900;
  4 + }
  5 +
  6 + .button1 {
  7 + display: inline-block;
  8 + height: 35px;
  9 + line-height: 35px;
  10 + padding-right: 15px;
  11 + padding-left: 50px;
  12 + position: relative;
  13 + background-color:rgb(41,127,184);
  14 + color:rgb(255,255,255);
  15 + text-decoration: none;
  16 + text-transform: uppercase;
  17 + letter-spacing: 1px;
  18 + margin-bottom: 15px;
  19 + border: 0;
  20 +
  21 +
  22 + border-radius: 5px;
  23 + -moz-border-radius: 5px;
  24 + -webkit-border-radius: 5px;
  25 + text-shadow:0px 1px 0px rgba(0,0,0,0.5);
  26 + -ms-filter:"progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=1,Color=#ff123852,Positive=true)";zoom:1;
  27 + filter:progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=1,Color=#ff123852,Positive=true);
  28 +
  29 + -moz-box-shadow:0px 2px 2px rgba(0,0,0,0.2);
  30 + -webkit-box-shadow:0px 2px 2px rgba(0,0,0,0.2);
  31 + box-shadow:0px 2px 2px rgba(0,0,0,0.2);
  32 + -ms-filter:"progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=2,Color=#33000000,Positive=true)";
  33 + filter:progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=2,Color=#33000000,Positive=true);
  34 + }
  35 +
  36 + .button1 span {
  37 + position: absolute;
  38 + left: 0;
  39 + top: 0;
  40 + width: 35px;
  41 + background-color:rgba(0,0,0,0.5);
  42 +
  43 + -webkit-border-top-left-radius: 5px;
  44 + -webkit-border-bottom-left-radius: 5px;
  45 + -moz-border-radius-topleft: 5px;
  46 + -moz-border-radius-bottomleft: 5px;
  47 + border-top-left-radius: 5px;
  48 + border-bottom-left-radius: 5px;
  49 + border-right: 1px solid rgba(0,0,0,0.15);
  50 + }
  51 +
  52 + .button1:hover span, .button1.active span {
  53 + background-color:rgb(0,102,26);
  54 + border-right: 1px solid rgba(0,0,0,0.3);
  55 + }
  56 +
  57 + .button1:active {
  58 + margin-top: 2px;
  59 + margin-bottom: 13px;
  60 +
  61 + -moz-box-shadow:0px 1px 0px rgba(255,255,255,0.5);
  62 + -webkit-box-shadow:0px 1px 0px rgba(255,255,255,0.5);
  63 + box-shadow:0px 1px 0px rgba(255,255,255,0.5);
  64 + -ms-filter:"progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=1,Color=#ccffffff,Positive=true)";
  65 + filter:progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=1,Color=#ccffffff,Positive=true);
  66 + }
  67 +
  68 + .button1.turquoise {
  69 + background: #449d44;
  70 + }
  71 +</style>
  72 +
  73 +<div class="main">
  74 + <div class="container">
  75 + <div class="row">
  76 + <div class="col-md-12">
  77 + <div class="widget stacked ">
  78 + <div class="widget-content" style="min-height: 500px">
  79 + <h3>Coming Soon</h3>
  80 + <!-- /widget-content -->
  81 + </div>
  82 + <!-- /widget -->
  83 + </div>
  84 + <!-- /span8 -->
  85 + </div>
  86 + <!-- /row -->
  87 + </div>
  88 + <!-- /container -->
  89 +</div>
  90 +<!-- /main -->
0 91 \ No newline at end of file
... ...
app/partials/flightTracking/flightTracking.service.js
Diff comments   View file @e196b9b
... ... @@ -0,0 +1,58 @@
  1 +(function(){
  2 + 'use strict';
  3 + angular.module('acufuel')
  4 + .service('flightTrackingService', ['$q', '$http', 'BASE_URL', flightTrackingService]);
  5 +
  6 + function flightTrackingService($q, $http, BASE_URL) {
  7 + var temp = {};
  8 +
  9 + this.getEvents = function() {
  10 + var deferred = $q.defer();
  11 + $http({
  12 + method : 'GET',
  13 + url : BASE_URL.url +'/user/schedules',
  14 + headers : {'Content-Type': 'application/json'},
  15 + })
  16 + .then(function (result){
  17 + deferred.resolve(result.data);
  18 + },function (result){
  19 + deferred.resolve(result.data);
  20 + })
  21 + return deferred.promise;
  22 + }
  23 +
  24 + this.addNewEventService = function(data) {
  25 + var deferred = $q.defer();
  26 + $http({
  27 + method : 'POST',
  28 + url : BASE_URL.url +'/scheduler',
  29 + headers : {'Content-Type': 'application/json'},
  30 + data: data
  31 + })
  32 + .then(function (result){
  33 + deferred.resolve(result.data);
  34 + },function (result){
  35 + deferred.resolve(result.data);
  36 + })
  37 + return deferred.promise;
  38 + }
  39 +
  40 + this.updateScheduledEvent = function(data) {
  41 + var deferred = $q.defer();
  42 + $http({
  43 + method : 'PUT',
  44 + url : BASE_URL.url +'/scheduler',
  45 + headers : {'Content-Type': 'application/json'},
  46 + data: data
  47 + })
  48 + .then(function (result){
  49 + deferred.resolve(result.data);
  50 + },function (result){
  51 + deferred.resolve(result.data);
  52 + })
  53 + return deferred.promise;
  54 + }
  55 +
  56 + }
  57 +
  58 +})();
0 59 \ No newline at end of file
... ...
app/partials/main/main.controller.js
Diff comments   View file @e196b9b
... ... @@ -7,7 +7,7 @@
7 7  
8 8 function MainController($scope, $filter, $rootScope, $state) {
9 9  
10   -
  10 + $scope.currentUserName = JSON.parse(localStorage.getItem('currentUserName'));
11 11 }
12 12 })();
13 13  
... ...
app/partials/main/main.html
Diff comments   View file @e196b9b
... ... @@ -16,12 +16,11 @@
16 16 <li class="dropdown">
17 17 <a href="javscript:;" class="dropdown-toggle" data-toggle="dropdown">
18 18 <i class="icon-plane"></i>
19   - Latitude Jet Center
  19 + {{currentUserName}}
20 20 <b class="caret"></b>
21 21 </a>
22 22 <ul class="dropdown-menu">
23 23 <li ng-if="!isAuthenticated"><a href="javascript:;">My Profile</a></li>
24   - <li ng-if="isAuthenticated"><a href="javascript:;">FBO Profile</a></li>
25 24 <li ng-if="isAuthenticated"><a ui-sref="app.accountSetting">Account Settings</a></li>
26 25 <li class="divider"></li>
27 26 <li><a href="#" ng-click="logout();">Logout</a></li>
... ... @@ -61,11 +60,11 @@
61 60 </li>
62 61 <li><a ui-sref="app.fuelManager" href="#/fuelManager">Ramp Free Manager</a></li>
63 62 <li class="dropdown-submenu">
64   - <a tabindex="-1" href="#">Tax Manager</a>
  63 + <a tabindex="-1" >Tax Manager</a>
65 64 <ul class="dropdown-menu">
66   - <li><a tabindex="-1" href="#">Federal Taxes</a></li>
67   - <li><a href="#">State & Country Taxes</a></li>
68   - <li><a href="#">Airport Taxes</a></li>
  65 + <li><a tabindex="-1" ui-sref="app.taxes">Federal Taxes</a></li>
  66 + <li><a ui-sref="app.taxes">State & Country Taxes</a></li>
  67 + <li><a ui-sref="app.taxes">Airport Taxes</a></li>
69 68 </ul>
70 69 </li>
71 70 <li ng-if="isAuthenticated">
... ... @@ -78,14 +77,14 @@
78 77 <li class="dropdown" ng-if="isAuthenticated">
79 78 <a href="javascript:;" class="dropdown-toggle" data-toggle="dropdown">
80 79 <i class="fa fa-user"></i>
81   - <span>Customers</span>
  80 + <span>Accounts</span>
82 81 <b class="caret"></b>
83 82 </a>
84 83 <ul class="dropdown-menu">
85 84 <!-- <li><a ui-sref="app.viewCompany">View Companies</a></li> -->
86   - <li><a ui-sref="app.customers">View Contacts</a></li>
  85 + <li><a ui-sref="app.customers">View Customers</a></li>
87 86 <li><a ui-sref="app.account">View Fuel Vendors</a></li>
88   - <li><a ui-sref="app.analytics">Research Flight Dept</a></li>
  87 + <li><a ui-sref="app.analytics">Lookup Flight Dept</a></li>
89 88 </ul>
90 89 </li>
91 90 <li ng-if="isAuthenticated">
... ... @@ -101,14 +100,19 @@
101 100 <b class="caret"></b>
102 101 </a>
103 102 <ul class="dropdown-menu">
104   - <li><a href="#">Live Flight tracking</a></li>
105   - <li><a href="#">Research Flight Dept</a></li>
  103 + <!-- <li><a href="#">Live Flight tracking</a></li> -->
106 104 <li><a href="#">Historical Fuel Prices</a></li>
107 105 <li><a href="#">Regional Pricing</a></li>
108 106 <li><a href="#">Actual vs. Canceled Fuelings</a></li>
109 107 <li><a href="#">Customer Lead Sources</a></li>
110 108 </ul>
111 109 </li>
  110 + <li ng-if="isAuthenticated">
  111 + <a ui-sref="app.flightTracking">
  112 + <i class="fa fa-plane"></i>
  113 + <span>Flight Tracking</span>
  114 + </a>
  115 + </li>
112 116 <li ng-if="!isAuthenticated">
113 117 <a ui-sref="app.flightDepDashboard">
114 118 <i class="fa fa-search"></i>
... ...
app/partials/taxes/taxes.controller.js
Diff comments   View file @e196b9b
... ... @@ -0,0 +1,10 @@
  1 +'use strict';
  2 +
  3 +angular.module('acufuel')
  4 +
  5 +.controller('taxesController', ['$scope','$compile', 'uiCalendarConfig', 'taxesService', function($scope, $compile, uiCalendarConfig, taxesService) {
  6 +
  7 +
  8 +
  9 +}]);
  10 +
... ...
app/partials/taxes/taxes.html
Diff comments   View file @e196b9b
... ... @@ -0,0 +1,90 @@
  1 +<style>
  2 + .subnavbar .mainnav > li:nth-child(3) > a{
  3 + color: #ff9900;
  4 + }
  5 +
  6 + .button1 {
  7 + display: inline-block;
  8 + height: 35px;
  9 + line-height: 35px;
  10 + padding-right: 15px;
  11 + padding-left: 50px;
  12 + position: relative;
  13 + background-color:rgb(41,127,184);
  14 + color:rgb(255,255,255);
  15 + text-decoration: none;
  16 + text-transform: uppercase;
  17 + letter-spacing: 1px;
  18 + margin-bottom: 15px;
  19 + border: 0;
  20 +
  21 +
  22 + border-radius: 5px;
  23 + -moz-border-radius: 5px;
  24 + -webkit-border-radius: 5px;
  25 + text-shadow:0px 1px 0px rgba(0,0,0,0.5);
  26 + -ms-filter:"progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=1,Color=#ff123852,Positive=true)";zoom:1;
  27 + filter:progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=1,Color=#ff123852,Positive=true);
  28 +
  29 + -moz-box-shadow:0px 2px 2px rgba(0,0,0,0.2);
  30 + -webkit-box-shadow:0px 2px 2px rgba(0,0,0,0.2);
  31 + box-shadow:0px 2px 2px rgba(0,0,0,0.2);
  32 + -ms-filter:"progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=2,Color=#33000000,Positive=true)";
  33 + filter:progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=2,Color=#33000000,Positive=true);
  34 + }
  35 +
  36 + .button1 span {
  37 + position: absolute;
  38 + left: 0;
  39 + top: 0;
  40 + width: 35px;
  41 + background-color:rgba(0,0,0,0.5);
  42 +
  43 + -webkit-border-top-left-radius: 5px;
  44 + -webkit-border-bottom-left-radius: 5px;
  45 + -moz-border-radius-topleft: 5px;
  46 + -moz-border-radius-bottomleft: 5px;
  47 + border-top-left-radius: 5px;
  48 + border-bottom-left-radius: 5px;
  49 + border-right: 1px solid rgba(0,0,0,0.15);
  50 + }
  51 +
  52 + .button1:hover span, .button1.active span {
  53 + background-color:rgb(0,102,26);
  54 + border-right: 1px solid rgba(0,0,0,0.3);
  55 + }
  56 +
  57 + .button1:active {
  58 + margin-top: 2px;
  59 + margin-bottom: 13px;
  60 +
  61 + -moz-box-shadow:0px 1px 0px rgba(255,255,255,0.5);
  62 + -webkit-box-shadow:0px 1px 0px rgba(255,255,255,0.5);
  63 + box-shadow:0px 1px 0px rgba(255,255,255,0.5);
  64 + -ms-filter:"progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=1,Color=#ccffffff,Positive=true)";
  65 + filter:progid:DXImageTransform.Microsoft.dropshadow(OffX=0,OffY=1,Color=#ccffffff,Positive=true);
  66 + }
  67 +
  68 + .button1.turquoise {
  69 + background: #449d44;
  70 + }
  71 +</style>
  72 +
  73 +<div class="main">
  74 + <div class="container">
  75 + <div class="row">
  76 + <div class="col-md-12">
  77 + <div class="widget stacked ">
  78 + <div class="widget-content" style="min-height: 500px">
  79 + <h3>Coming Soon</h3>
  80 + <!-- /widget-content -->
  81 + </div>
  82 + <!-- /widget -->
  83 + </div>
  84 + <!-- /span8 -->
  85 + </div>
  86 + <!-- /row -->
  87 + </div>
  88 + <!-- /container -->
  89 +</div>
  90 +<!-- /main -->
0 91 \ No newline at end of file
... ...
app/partials/taxes/taxes.service.js
Diff comments   View file @e196b9b
... ... @@ -0,0 +1,58 @@
  1 +(function(){
  2 + 'use strict';
  3 + angular.module('acufuel')
  4 + .service('taxesService', ['$q', '$http', 'BASE_URL', taxesService]);
  5 +
  6 + function taxesService($q, $http, BASE_URL) {
  7 + var temp = {};
  8 +
  9 + this.getEvents = function() {
  10 + var deferred = $q.defer();
  11 + $http({
  12 + method : 'GET',
  13 + url : BASE_URL.url +'/user/schedules',
  14 + headers : {'Content-Type': 'application/json'},
  15 + })
  16 + .then(function (result){
  17 + deferred.resolve(result.data);
  18 + },function (result){
  19 + deferred.resolve(result.data);
  20 + })
  21 + return deferred.promise;
  22 + }
  23 +
  24 + this.addNewEventService = function(data) {
  25 + var deferred = $q.defer();
  26 + $http({
  27 + method : 'POST',
  28 + url : BASE_URL.url +'/scheduler',
  29 + headers : {'Content-Type': 'application/json'},
  30 + data: data
  31 + })
  32 + .then(function (result){
  33 + deferred.resolve(result.data);
  34 + },function (result){
  35 + deferred.resolve(result.data);
  36 + })
  37 + return deferred.promise;
  38 + }
  39 +
  40 + this.updateScheduledEvent = function(data) {
  41 + var deferred = $q.defer();
  42 + $http({
  43 + method : 'PUT',
  44 + url : BASE_URL.url +'/scheduler',
  45 + headers : {'Content-Type': 'application/json'},
  46 + data: data
  47 + })
  48 + .then(function (result){
  49 + deferred.resolve(result.data);
  50 + },function (result){
  51 + deferred.resolve(result.data);
  52 + })
  53 + return deferred.promise;
  54 + }
  55 +
  56 + }
  57 +
  58 +})();
0 59 \ No newline at end of file
... ...
app/partials/viewCompany/viewCompany.html
Diff comments   View file @e196b9b
... ... @@ -144,7 +144,7 @@
144 144 <input type="tel" ng-model="companyData.baseIcao" ng-click="base()" style="line-height: 18px;width: 80px;padding: 0px 9px;" />
145 145  
146 146 <div class="pull-right" style="margin-top: 5px; margin-right: 10px;">
147   - <toggle ng-model="companyData.activate" ng-change="changeCompanyStatus()" size="customToogle" on="Active" off="Dactive"></toggle>
  147 + <toggle ng-model="companyData.activate" ng-change="changeCompanyStatus()" size="customToogle" on="Active" off="Inactive"></toggle>
148 148 </div>
149 149  
150 150 </div>
... ... @@ -210,7 +210,7 @@
210 210 <button ng-click="cancelData()" ng-show="showUpdateBtn" class="btn btn-default">Cancel</button>
211 211 </div>
212 212 <div class="pull-right">
213   - <button type="button" ng-click="openConfirmMail()" class="btn btn-primary">Distribute Price to Company Contacts</button>
  213 + <button type="button" ng-click="sendMail()" class="btn btn-primary">Distribute Price to Company Contacts</button>
214 214 <button type="button" class="btn btn-info" ui-sref="app.updateFuelManager">Setup Fuel</button>
215 215 </div>
216 216 <div class="clearfix"></div>
... ... @@ -226,7 +226,7 @@
226 226 <input type="tel" ng-model="companyData.baseIcao" ng-click="base()" style="line-height: 18px;width: 80px;padding: 0px 9px;" />
227 227  
228 228 <div class="pull-right" style="margin-top: 5px; margin-right: 10px;">
229   - <toggle ng-model="companyData.activate" ng-change="changeCompanyStatus()" size="customToogle" on="Active" off="Dactive"></toggle>
  229 + <toggle ng-model="companyData.activate" ng-change="changeCompanyStatus()" size="customToogle" on="Active" off="Inactive"></toggle>
230 230 </div>
231 231  
232 232 </div>
... ... @@ -322,7 +322,7 @@
322 322 <button ng-click="cancelData()" ng-show="showUpdateBtn" class="btn btn-default">Cancel</button>
323 323 </div>
324 324 <div class="pull-right">
325   - <button type="button" ng-click="openConfirmMail()" class="btn btn-primary">Distribute Price to Company Contacts</button>
  325 + <button type="button" ng-click="sendMail()" class="btn btn-primary">Distribute Price to Company Contacts</button>
326 326 <button type="button" class="btn btn-info" ui-sref="app.updateFuelManager">Setup Fuel</button>
327 327 </div>
328 328 <div class="clearfix"></div>
... ... @@ -424,7 +424,7 @@
424 424 </div>
425 425 <div class="widget-content">
426 426 <div class="table-responsive">
427   - <table class="table table-striped" style="position: relative; top: -33px; margin-bottom: 0;">
  427 + <table class="table table-striped" style="position: relative; margin-bottom: 0;">
428 428 <thead>
429 429 <tr>
430 430 <th>Omit</th>
... ...
app/partials/viewFuelVendor/viewFuelVendor.controller.js
Diff comments   View file @e196b9b
... ... @@ -79,6 +79,7 @@
79 79 $('#contact-modal-3').modal('hide');
80 80 $scope.primayData.id = result.data;
81 81 $scope.sendPrimaryContact();
  82 + $scope.contactData.contactList = [];
82 83 $scope.data = {};
83 84 getContactList();
84 85 }else{
... ...
app/partials/viewFuelVendor/viewFuelVendor.html
Diff comments   View file @e196b9b
... ... @@ -140,7 +140,7 @@
140 140 <i class="fa fa-building-o" aria-hidden="true"></i>
141 141 <h3>Vendor Details</h3>
142 142 <div class="pull-right" style="margin-top: 5px; margin-right: 10px;">
143   - <toggle ng-model="vendorData.activate" ng-change="changeCompanyStatus()" size="customToogle" on="Active" off="Dactive"></toggle>
  143 + <toggle ng-model="vendorData.activate" ng-change="changeCompanyStatus()" size="customToogle" on="Active" off="Inactive"></toggle>
144 144 </div>
145 145 </div>
146 146 <div class="widget-content">
... ... @@ -205,7 +205,7 @@
205 205 <button ng-click="cancelData()" ng-show="showUpdateBtn" class="btn btn-default">Cancel</button>
206 206 </div>
207 207 <div class="pull-right">
208   - <button type="button" ng-click="openConfirmMail()" class="btn btn-primary">Distribute Price to Vendor Contacts</button>
  208 + <button type="button" ng-click="sendMail()" class="btn btn-primary">Distribute Price to Vendor Contacts</button>
209 209 </div>
210 210 <div class="clearfix"></div>
211 211 </div>
... ...
app/partials/viewcontact/viewcontact.controller.js
Diff comments   View file @e196b9b
... ... @@ -65,11 +65,17 @@
65 65 var statusData = "status=" + $scope.contactDetail.priceEmail;
66 66 ViewcontactService.changePriceEmail(id, statusData).then(function(result) {
67 67 if(result.success){
68   - $('#toogleMail').css('display', 'block');
  68 + //$('#toogleMail').css('display', 'block');
69 69 if($scope.contactDetail.priceEmail == true){
70   - $scope.messageText = 'You have enabled price distribution for this contact';
  70 + toastr.success('You have enabled price distribution for this contact', {
  71 + closeButton: true
  72 + })
  73 + // $scope.messageText = 'You have enabled price distribution for this contact';
71 74 }else{
72   - $scope.messageText = 'You have disabled price distribution for this contact';
  75 + toastr.success('You have disabled price distribution for this contact', {
  76 + closeButton: true
  77 + })
  78 + //$scope.messageText = 'You have disabled price distribution for this contact';
73 79 }
74 80 }
75 81 })
... ...
app/partials/viewcontact/viewcontact.html
Diff comments   View file @e196b9b
... ... @@ -14,7 +14,7 @@
14 14 <div class="widget-header">
15 15 <i class="icon-pencil"></i>
16 16 <i class="fa fa-building-o" aria-hidden="true"></i>
17   - <h3>Antioch Flight Department</h3>
  17 + <h3>{{contactDetail.owner.companyName}}</h3>
18 18 <i class="fa fa-times" areia-hidden="true" ng-click="goBack()" style="float: right; margin-top: 10px; margin-right: 10px; cursor: pointer;"></i>
19 19 </div>
20 20 <div class="widget-content" style="padding-left: 0; padding-right: 0; ">
... ... @@ -53,10 +53,10 @@
53 53 {{contactDetail.owner.companyName}}
54 54 </div>
55 55 <div class="col-md-6">
56   - <div style="margin-bottom: 10px" class="input-group email-password">
  56 + <!-- <div style="margin-bottom: 10px" class="input-group email-password">
57 57 <span class="input-group-addon email-password"><i class="glyphicon glyphicon-user email-password-icon"></i></span>
58 58 <input id="login-username" type="text" ng-model="contactDetail.userName" class="form-control email-password" placeholder="username or email">
59   - </div>
  59 + </div> -->
60 60  
61 61 <!-- <div class="input-group email-password">
62 62 <span class="input-group-addon email-password"><i class="fa fa-key" aria-hidden="true"></i></span>
... ... @@ -65,26 +65,26 @@
65 65 </div>
66 66 </div>
67 67 <div>
68   - <p>
  68 + <!-- commented <p>
69 69 <span ng-show="editAddress">
70 70 <i class="fa fa-map-marker"></i> {{contactDetail.address}} &nbsp;
71 71 <i class="fa fa-pencil-square-o" ng-click="addressEdit()" style="font-size: 11px;" aria-hidden="true"></i>
72 72 </span>
73 73  
74 74 <input type="text" ng-hide="editAddress" style="width: 50%;" class="form-control" ng-model="contactDetail.address">
75   - </p>
  75 + </p> -->
76 76  
77   - <p ng-show="editPhone"><i class="fa fa-phone"></i> {{contactDetail.mobilePhone}} &nbsp;<i class="fa fa-pencil-square-o" ng-click="phoneEdit()" style="font-size: 11px;" aria-hidden="true"></i></p>
  77 + <p ng-show="editPhone">Phone {{contactDetail.mobilePhone}} &nbsp;<i class="fa fa-pencil-square-o" ng-click="phoneEdit()" style="font-size: 11px;" aria-hidden="true"></i></p>
78 78 <p ng-hide="editPhone">
79 79 <input type="text" style="width: 50%;" ng-model="contactDetail.mobilePhone" class="form-control">
80 80 </p>
81 81  
82   - <p ng-show="editMobile"><i class="fa fa-mobile"></i> {{contactDetail.workPhone}} &nbsp;<i class="fa fa-pencil-square-o" ng-click="mobileEdit()" style="font-size: 11px;" aria-hidden="true"></i></p>
  82 + <p ng-show="editMobile">Mobile {{contactDetail.workPhone}} &nbsp;<i class="fa fa-pencil-square-o" ng-click="mobileEdit()" style="font-size: 11px;" aria-hidden="true"></i></p>
83 83 <p ng-hide="editMobile">
84 84 <input type="text" style="width: 50%;" ng-model="contactDetail.workPhone" class="form-control">
85 85 </p>
86 86  
87   - <p ng-show="editEmail"><i class="fa fa-envelope"></i> {{contactDetail.email}} &nbsp;<i class="fa fa-pencil-square-o" ng-click="emailEdit()" style="font-size: 11px;" aria-hidden="true"></i></p>
  87 + <p ng-show="editEmail">Email {{contactDetail.email}} &nbsp;<i class="fa fa-pencil-square-o" ng-click="emailEdit()" style="font-size: 11px;" aria-hidden="true"></i></p>
88 88 <p ng-hide="editEmail">
89 89 <input type="email" style="width: 50%;" ng-model="contactDetail.email" class="form-control">
90 90 </p>
... ...