viithiisys / Acufuel

Browse Code »

Commit 05c2f6fb3bcf2961c17df3d0439d64c0078bab4d

Authored by Swarn Singh 2017-05-23 05:15:30 -0400

1 parent 1097c2ce17

Exists in master

margin module and tier module Done

Showing 4 changed files with 218 additions and 42 deletions Show diff stats

app/css/custom.css

Diff comments View file @05c2f6f

 /*------------------------------------------------------------------
 [Custom Stylesheet]
 Last change:	03/25/2013
 Assigned to:	You
 -------------------------------------------------------------------*/
 body{
 	color: #333;
 }
 .custom-widget-content{
 	width: 100%;
 	height: auto;
 	padding: 15px 0;
 	background-color: #fff;
 	border: 1px solid #D5D5D5;
 	border-radius: 0 0 5px 5px;
 }
 .hr{
 	margin: 5px 0;
 }
 .disableSelect:disabled{
 	border: 0;
 	background-color: transparent;
 	color: #f90;
 	box-shadow: none;
 	-webkit-appearance: none;
     appearance: none;
 }
 .disableInput:disabled{
 	border: 0;
 	background-color: transparent;
 	color: #222;
 	box-shadow: none;
 }
 .img-logo{
 	height: 25px;
 	padding-left: 10%;
 }
 .widget-header > i{
 	display: inline-block;
     margin-top: -3px;
     margin-left: 13px;
     margin-right: -2px;
     font-size: 16px;
     color: #555;
     vertical-align: middle;
 }
 table{
 	width: 100%;
 }
 table th, td{
 	font-size: 13px;
 }
 .navbar-brand{
 	height: auto;
 }
 .custom-widget-content .btn-xs{
 	padding: 3px 5px;
 }
 .fc-event{
 	background-color: #ff9900 !important;
 	color: #fff !important;
 	border: 1px solid #ff9900 !important;
 }
 .pull-right-color{
 	background-image: linear-gradient(to bottom, #1c84c6  0%, #1c84c6  100%);
 }
 .pull-right-setup{
 	margin-bottom: 10px;
 	background-image: linear-gradient(to bottom, #1c84c6  0%, #1c84c6  100%);
 }
 .Airport{
 	padding-top: 5px;
 }
 .src-image{
 	width: 50px;
 	height: 50px;
 }
 .Accept{
 	padding-top: 25px;
 }
 .dis{
 	float: left;
 	margin-right:100px;
 }
 /*.email-password{
 	width: 40px;
 	height: 24px;
 }*/
 .email-password-icon{
 	width: 10px;
 	height: 10px;
 }
 @media( max-width: 768px;){
 .btn{
 font-size: 10px !important;
 }
 .dis{
 	float: none;
 	margin-right: 0px;
 }
 }
 .Search-tabs{
 	border-bottom: 0px solid #ddd; */
 }
 .customer-table table{
 	width: 100%;
 }
 .customer-table input{
 	border-radius: 0;
 	box-shadow: none;
 	border: 1px solid #e4e3e3;
 	padding: 0px;
 	font-size: 10px;
 	display: -webkit-inline-box;
 	display: inline-box;
 	height: 31px;
 }
 .customer-table select{
 	border-radius: 0;
 	box-shadow: none;
 	border: 1px solid #e4e3e3;
 	padding: 0px;
 	font-size: 10px;
 	height: 31px;
 	display: -webkit-inline-box;
 	display: inline-box;
 }
 .customer-table th > label{
 	font-weight: bold;
 	padding: 10px 5px 2px 5px;
 	margin-bottom: 0;
 }
 .customer-table td{
 	padding: 5px !important;
 	height: auto !important;
 	vertical-align: middle !important;
 }
 .customer-table td > select{
 	height: 22px !important;
 }
 .customer-table td > button{
 	font-size: 10px;
 }
 /*.new-input-label{
 	margin-bottom: 0;
 	line-height: 34px;
 }*/
 /*  new custom css for accrodian tabs */
 .customAccordianHeader{
 	width: 100%;
 	height: auto;
 	background-color: #F3F3F3;
 	border: 1px solid #ddd;
     color: #333;
     box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.35);
     border-radius: 3px 3px 3px 3px;
     padding: 10px 15px;
     margin-top: 10px;
 }
 .customAccordianHeader.customActive{
 	background-image: -webkit-gradient(linear, left 0%, left 100%, from(#555555), to(#3b3b3b));
 	background-image: linear-gradient(to bottom, #555555 0%, #3b3b3b 100%);
 	background-repeat: repeat-x;
 	border: 1px solid #222222;
     color: #FFF;
     border-radius: 3px 3px 0 0;
 }
 .customAccordianHeader > span{
 	font-size: 15px;
 	margin-right: 20px;
 	line-height: 22px;
 	float: left;
 }
 .customAccordianHeader .btn{
 	padding: 2px 12px;
 }
 .customAccordianHeader > .form-control{
 	outline: none;
 	box-shadow: none;
 }
 .customAccordianHeader > select.form-control{
 	width: 150px;
 	height: 26px;
 	padding: 0 6px;
 	margin-right: 20px;
 	float: left;
 }
 .customAccordianHeader > select.form-control[disabled]{
 	border: none;
 	-webkit-appearance: none;
 	-moz-appearance: none;
 	appearance: none;
 	background-color: transparent;
 	color: #f90;
 	width: auto;
 }
 .customAccordianHeader > input.form-control{
 	width: 80px;
 	height: 26px;
 	padding: 0 6px;
 	float: left;
 }
 .customAccordianHeader > input.form-control[disabled]{
 	border: none;
 	-webkit-appearance: none;
 	-moz-appearance: none;
 	appearance: none;
 	background-color: transparent;
 	color: #333;
 }
 .customAccordianTabBody{
 	width: 100%;
 	height: auto;
 	padding: 15px;
 	border: 1px solid #ddd;
 	border-top: 0;
 	border-radius: 0 0 3px 3px;
 }
 .customTableWithFilter{
 	width: auto;
 	height: auto;
 }
 .customTableWithFilter th{
 	padding: 5px;
 	background-color: #f3f3f3;
 	border: 1px solid #ddd;
 }
 .customTableWithFilter th i{
 	margin-top: 3px;
 }
 .customTableWithFilter th span{
 	font-size: 11px;
 	color: #222;
 }
 .customTableWithFilter th input{
 	width: 50px;
 }
 .customTableWithFilter td{
 	padding: 5px;
 	border: 1px solid #ddd;
 }
 .customTableWithFilter td span{
 	font-size: 11px;
 }
 .customTableWithFilter td span:first-child{
 	color: #449d44;
 	font-weight: bold;
 }
 .customTableWithFilter td span:last-child{
 	color: #c9302c;
 	font-style: italic;
 	font-weight: bold;
 }
 .customTableWithFilter td .tierTextBox{
 	width: 70px;
 }
 .customTableWithFilter .addTierButton{
 	color: #fff;
 	background-color: #2196f3;
 	border: none;
 	padding: 3px 5px;
 }
 .customTableWithFilter td .fa-trash-o{
 	color: #fff;
 	background-color: #c9302c;
 	padding: 5px;
 	border-radius: 3px;
 	cursor: pointer;
 }
 .resizeTextarea{
 	resize: vertical;
 	margin-top: 20px;
 }
 .new-widget-content{
 	padding: 0 0 0 0 !important;
 }
 .new-tab-heading{
 	padding: 5px;
 	color: #333;
 	background-color: #fcfcfc;
 	border-bottom: 1px solid #d5d5d5;
 	border-right: 1px solid #d5d5d5;
 }
 .new-tab-body{
 	border-right: 1px solid #d5d5d5;
 	border-bottom: 1px solid #d5d5d5;
 	padding-left: 15px;
 	padding-bottom: 5px;
 }
 .new-tab-heading i.fa{
 	font-size: 16px;
 	cursor: pointer;
 }
 .new-tab-heading span{
 	font-size: 14px;
 	margin-left: 5px;
 }
 .new-tab-heading i.fa-plus-circle{
 	color: #067dfc;
 }
 .new-tab-heading i.fa-minus-circle{
 	color: #d00d09;
 }
 .new-tab-body-th{
 	color: #333;
 }
 .new-tab-body-th > div{
 	font-size: 12px;
 	font-weight: bold;
 	padding-right: 5px;
 	padding-left: 5px;
 	text-align: center;
 }
 .new-tab-body-th > div:first-child{
 	font-size: 14px;
 	font-weight: bold;
 	text-align: left;
 }
 .new-tab-body-td i.fa-plus-circle{
 	color: #067dfc;
 }
 .new-tab-body-td i.fa-minus-circle{
 	color: #d00d09;
 }
 .new-tab-body-td input{
 	width: 50px;
 	height: 24px;
 }
 .new-tab-body-td .fa{
 	font-size: 14px;
 }
 .new-tab-body-td > div:first-child > div{
 	padding-right: 5px;
 	padding-left: 5px;
 	text-align: center;
 }
 .new-tab-body-td > div:first-child > div:first-child{
 	text-align: left;
 }
 .appliesTableHeading{
 	border: 1px solid #d5d5d5;
 	padding: 5px;
 	color: #333;
 	font-weight: bold;
 	background-color: #fcfcfc;
 	margin: 10px 0 0 0;
 }
 .appliesTableBody{
 	border: 1px solid #d5d5d5;
 	border-top: 0;
 	background-color: #ffffe0;
 	margin-bottom: 10px;
 	height: auto;
 }
 .appliesTableBody > div.firstDiv{
 	height: 100px;
 	float: left;
 	width: 40%;
 	border-right: 1px solid #d5d5d5;
 	overflow: auto;
 	padding: 5px;
 }
 .appliesTableBody > div.lastDiv{
 	width: 59%;
 	height: 100px;
 	padding: 5px;
 	float: left;
 }
 .appliesTableBody > div.lastDiv textarea{
 	width: 40%;
 	height: 60px;
 	margin: 15px 0;
 	resize: none;
 	float: left;
 }
 .reportedByTag{
 	width: 60%;
 	height: 80px;
 	border-top: 10px solid #393;
 	border-left: 10px solid #6c6;
 	border-radius: 5px 0 0 5px;
 	background-color: #d7d7d7;
 	float: right;
 	position: relative;
     right: -13px;
     margin-top: 5px;
     font-size: 11px;
 }
 .confirmedTag{
 	background-color: #393;
 	color: #fff;
 	-webkit-transform: rotate(-90deg);
     -moz-transform: rotate(-90deg);
     -o-transform: rotate(-90deg);
     -ms-transform: rotate(-90deg);
     transform: rotate(-90deg);
     position: absolute;
     bottom: 25px;
     left: -24px;
     width: 71px;
     text-align: center;
     font-size: 11px;
 }
 .reportedByTag table{
 	margin-left: 27px;
 	width: calc(100% - 27px);
 }
 .reportedByTag table td{
 	font-size: 11px;
 	text-align: center;
 	font-weight: bold;
 }
 .reportedByTag table tr:last-child td{
 	text-align: left;
 	font-weight: normal;
 	font-size: 10px;
 }
 .feeManagerRight{
 	min-height: 70px;
 	position: relative;
 }
 .feeManagerRight div{
 	position: absolute;
 	bottom: 0;
 	width: 100%;
 }
 .new-tab-body-td{
 	padding: 5px 0;
 }
 /*  new checkbox slide css */
 .onoffswitch {
     position: relative; width: 80px;
     -webkit-user-select:none;
     -moz-user-select:none;
     -ms-user-select: none;
     margin: auto;
 }
 .onoffswitch-checkbox {
     display: none;
 }
 .onoffswitch-label {
     display: block;
     overflow: hidden;
     cursor: pointer;
     border: 2px solid #999999;
     border-radius: 0px;
 }
 .onoffswitch-inner {
     display: block;
     width: 200%;
     margin-left: -100%;
     transition: margin 0.3s ease-in 0s;
 }
 .onoffswitch-inner:before, .onoffswitch-inner:after {
     display: block;
     float: left;
     width: 50%;
     height: 18px;
     padding: 0;
     line-height: 18px;
     font-size: 10px;
     color: white;
     font-family: Trebuchet, Arial, sans-serif;
     font-weight: bold;
     box-sizing: border-box;
 }
 .onoffswitch-inner:before {
     content: "Include";
     padding-left: 5px;
     background-color: #016ADB; color: #FFFFFF;
     text-align: left;
 }
 .onoffswitch-inner:after {
     content: "Exclude";
     padding-right: 5px;
     background-color: ; color: #333333;
     text-align: right;
 }
 .onoffswitch-switch {
     display: block;
     width: 25px;
     margin: -3.5px;
     background: #FFFFFF;
     position: absolute;
     top: 0;
     bottom: 0;
     right: 58px;
     border: 2px solid #999999;
     border-radius: 0px;
     transition: all 0.3s ease-in 0s;
 }
 .onoffswitch-switch i{
 	line-height: 25px;
 }
 .onoffswitch-checkbox:checked + .onoffswitch-label .onoffswitch-inner {
     margin-left: 0;
 }
 .onoffswitch-checkbox:checked + .onoffswitch-label .onoffswitch-switch {
     right: 0px;
 }
 .onoffswitch-checkbox fa-check{
 	color: #00ff00;
 }
 .onoffswitch-checkbox fa-times{
 	color: #ff0000;
 }
 .newButtons{
 	background-color: #fff;
 	border-radius: 10px;
 	color: #333;
 	border: 1px solid #eee;
 	box-shadow: 5px 5px 6px rgba(0,0,0,0.3);
 	padding: 6px 15px;
 	margin-right: 10px;
 }
 .newButtons:disabled{
 	background-color: #eee;
 }
 *{
 	outline: none;
 }
 /*   my custom modal  */
 .customBackdrop{
 	position: fixed;
 	background-color: rgba(0, 0, 0, 0.15);
 	top: 0;
 	left: 0;
 	width: 100%;
 	height: 100%;
 	z-index: 999;
 }
 .customModalInner{
 	width: 100%;
 	max-width: 500px;
 	height: 200px;
 	top: 15%;
 	position: relative;
 	margin: auto;
 }
 .customModelHead, .customModelFooter{
 	width: 100%;
 	background-color: #fafafa;
 	border-bottom: 1px solid #ccc;
 	color: #333;
 	padding: 10px;
 }
 .customModelFooter{
 	border-top: 1px solid #ccc;
 }
 .customModelBody{
 	width: 100%;
 	height: auto;
 	background-color: #fff;
 	color: #333;
 	padding: 10px;
 }
 .customModelHead p{
 	margin-bottom: 0;
 	font-size: 14px;
 }
 .customModelFooter button{
 	border: 1px solid #ccc;
 }
 .customModelFooter input[type="submit"]{
 	background-color: #6ad46a;
 	border: 1px solid #ccc;
 }
 /*  custom confirmation model */
 .customConfirmPopBackdrop{
 	position: fixed;
 	background-color: rgba(0, 0, 0, 0.3);
 	top: 0;
 	left: 0;
 	width: 100%;
 	height: 100%;
 	z-index: 999;
 	display: none;
 }
 .customConfirmPopBackdrop .customModalInner{
 	top: 30%;
+}
+/*  tier list table */
+.tierListWrap{
+	width: 120px;
+	height: auto;
+	float: left;
+}
+.tierListHead{
+	width: 100%;
+	padding: 5px;
+	background-color: #f3f3f3;
+    border: 1px solid #ddd;
+    border-right: none;
+}
+.tierListBody{
+	width: 100%;
+	padding: 5px;
+	border: 1px solid #ddd;
+	border-top: none;
+	border-right: none;
+}
+.minTierSpan{
+	color: #449d44;
+	font-weight: bold;
+	font-size: 11px;
+}
+.maxTierSpan{
+	color: #c9302c;
+	font-style: italic;
+	font-size: 11px;
+	font-weight: bold;
+}
+.tierHeadingSpan{
+	font-size: 11px;
+	color: #222;
+	font-weight: bold;
+}
+.tierListHead input{
+	width: 50px;
+	height: 24px;
+}
+.addTierBtn{
+	color: #fff;
+	background-color: #2196f3;
+	border: none;
+	padding: 1px 5px;
+}
+.deleteTierIcon{
+	color: #fff;
+	background-color: #c9302c;
+	padding: 5px;
+	border-radius: 3px;
+	cursor: pointer;
 }

app/partials/updateFuelManager/updateFuelManager.controller.js

Diff comments View file @05c2f6f

 'use strict';
  //Load controller
   angular.module('acufuel')
       .controller('updateFuelManagerController', ['$scope','$uibModal', 'updateFuelManagerService', function($scope , $uibModal, updateFuelManagerService) {
         $scope.yes = function(data){
             console.log('========');
             console.log('value', data);
             $uibModal.yes({
                 templateUrl: 'partials/pricingcontact/pricingcontact.html',
                 backdrop: true,
                 scope: $scope,
             })
         }
         $scope.userProfileId = JSON.parse(localStorage.getItem('userProfileId'));
         updateFuelManagerService.getATypeJets($scope.userProfileId).then(function(result) {
-          console.log('result', result);
           $scope.aTypeJets = result;
         })
         $scope.toggleJestAccordian = function(id){
             $('.'+id).slideDown();
             $('#'+id).addClass('customActive');
             $('#'+id+' select, #'+id+' input').prop("disabled", false);
             $('#'+id+' .btn-success, #'+id+' .btn-danger').css('display', 'inline-block');
             $('#'+id+' .btn-default').css('display', 'none');
+            updateFuelManagerService.getJetTiers(id).then(function(tiers) {
+              $scope.tierList = tiers;
+            })
+        }
+        $scope.tr = {};
+        $scope.addNewTier = function(id){
+            $scope.tr.marginTotal = '1.00';
+            $scope.tr.marginTemplateId = id;
+            var tierData = 'minTierBreak='+$scope.tr.minTierBreak+'&maxTierBreak='+$scope.tr.maxTierBreak+'&margin='+$scope.tr.margin+
+            '&marginTotal='+$scope.tr.marginTotal+'&marginTemplateId='+$scope.tr.marginTemplateId;
+            updateFuelManagerService.addNewTier(tierData).then(function(result) {
+                toastr.success('Successfully Added', {
+                  closeButton: true
+                })
+                $scope.tr = {};
+                updateFuelManagerService.getJetTiers(id).then(function(tiers) {
+                  $scope.tierList = tiers;
+                })
+            })
+        }
+        $scope.editTier = function(tier){
+            var editTierData = 'minTierBreak='+tier.minTierBreak+'&maxTierBreak='+tier.maxTierBreak+'&margin='+tier.margin+
+            '&marginTotal='+tier.marginTotal+'&marginTemplateId='+tier.marginTemplate.id+'&marginId='+tier.id;
+            updateFuelManagerService.editTier(editTierData).then(function(result) {
+                toastr.success('Successfully Updated', {
+                  closeButton: true
+                })
+                updateFuelManagerService.getJetTiers(tier.marginTemplate.id).then(function(tiers) {
+                  $scope.tierList = tiers;
+                })
+            })
+        }
+        $scope.deleteTier = function(id){
+            console.log('delete id', id);
+            updateFuelManagerService.deleteTier(id).then(function(result) {
+                toastr.success('Successfully Deleted', {
+                  closeButton: true
+                })
+                updateFuelManagerService.getJetTiers(tier.marginTemplate.id).then(function(tiers) {
+                  $scope.tierList = tiers;
+                })
+            })
         }
         $scope.saveJetAccordian = function(jets){
             $scope.jetsDetail = jets;
             $scope.jetsDetail.userProfileId = $scope.userProfileId;
             //console.log('jets', $scope.jetsDetail);
             $('.'+$scope.jetsDetail.id).slideUp();
             $('#'+$scope.jetsDetail.id).removeClass('customActive');
             $('#'+$scope.jetsDetail.id+' select, #'+$scope.jetsDetail.id+' input').prop("disabled", true);
             $('#'+$scope.jetsDetail.id+' .btn-success, #'+$scope.jetsDetail.id+' .btn-danger').css('display', 'none');
             $('#'+$scope.jetsDetail.id+' .btn-default').css('display', 'inline-block');
             var editJetData = 'productType='+$scope.jetsDetail.productType+'&marginName='+$scope.jetsDetail.marginName+'&pricingStructure='+$scope.jetsDetail.pricingStructure+'&marginValue='+$scope.jetsDetail.marginValue+'&userProfileId='+$scope.jetsDetail.userProfileId+'&marginId='+$scope.jetsDetail.id;
             updateFuelManagerService.editAtypeJetMargin(editJetData).then(function(result) {
                 console.log('newJet', editJetData);
                 toastr.success('Successfully Updated', {
                   closeButton: true
                 })
                 updateFuelManagerService.getATypeJets($scope.userProfileId).then(function(result) {
                   console.log('result', result);
                   $scope.aTypeJets = result;
                 })
             })
         }
         $scope.addNewMarginBtn = function(){
             $('.addNewMargin').css('display', 'block');
         }
         $scope.closeMarginPopup = function(){
             $('.addNewMargin').css('display', 'none');
         }
         $scope.newJet = {};
         $scope.newJet.productType = '';
         $scope.addNewATypeJet = function(){
             $scope.newJet.productType = 'JET-A';
             $scope.newJet.userProfileId = $scope.userProfileId;
             var jetData = 'productType='+$scope.newJet.productType+'&marginName='+$scope.newJet.marginName+'&pricingStructure='+$scope.newJet.pricingStructure+'&marginValue='+$scope.newJet.marginValue+'&userProfileId='+$scope.newJet.userProfileId;
             updateFuelManagerService.addNewAtypeJetMargin(jetData).then(function(result) {
                 console.log('newJet', jetData);
                 toastr.success('Successfully Added', {
                   closeButton: true
                 })
                 $('.addNewMargin').css('display', 'none');
                 updateFuelManagerService.getATypeJets($scope.userProfileId).then(function(result) {
                   console.log('result', result);
                   $scope.aTypeJets = result;
                 })
             })
         }
        /* $scope.addNewATypeJet = function(){
             $scope.newJet.productType = 'JET-A';
             $scope.newJet.userProfileId = $scope.userProfileId;
             var jetData = 'productType='+$scope.newJet.productType+'&marginName='+$scope.newJet.marginName+'&pricingStructure='+$scope.newJet.pricingStructure+'&marginValue='+$scope.newJet.marginValue+'&userProfileId='+$scope.newJet.userProfileId;
             updateFuelManagerService.addNewAtypeJetMargin(jetData).then(function(result) {
                 console.log('newJet', jetData);
                 toastr.success('Successfully Added', {
                   closeButton: true
                 })
                 $('.addNewMargin').css('display', 'none');
                 updateFuelManagerService.getATypeJets($scope.userProfileId).then(function(result) {
                   console.log('result', result);
                   $scope.aTypeJets = result;
                 })
             })
         }*/
     }]);

app/partials/updateFuelManager/updateFuelManager.html

Diff comments View file @05c2f6f

1	<style>	1	<style>
2	.subnavbar .mainnav > li:nth-child(2) > a{	2	.subnavbar .mainnav > li:nth-child(2) > a{
3	color: #ff9900;	3	color: #ff9900;
4	}	4	}
5	</style>	5	</style>
6	<div class="container">	6	<div class="container">
7	<div class="row">	7	<div class="row">
8	<div class="col-md-5">	8	<div class="col-md-5">
9	<div class="widget stacked">	9	<div class="widget stacked">
10	<div class="widget-header">	10	<div class="widget-header">
11	<i class="fa fa-pencil"></i>	11	<i class="fa fa-pencil"></i>
12	<h3>Price Manager</h3>	12	<h3>Price Manager</h3>
13	<select style="float: right;margin:10px;" ng-model="priceManager" ng-change="yes(priceManager)">	13	<select style="float: right;margin:10px;" ng-model="priceManager" ng-change="yes(priceManager)">
14	<option value="1">Send Pricing Email</option>	14	<option value="1">Send Pricing Email</option>
15	<option value="2">Margin 1</option>	15	<option value="2">Margin 1</option>
16	<option value="3">Margin 2</option>	16	<option value="3">Margin 2</option>
17	<option value="4">Margin Tenants</option>	17	<option value="4">Margin Tenants</option>
18	</select>	18	</select>
19	</div>	19	</div>
20	<!-- /widget-header -->	20	<!-- /widget-header -->
21	<div class="widget-content">	21	<div class="widget-content">
22	<h6>Update Fuel Price Here</h6>	22	<h6>Update Fuel Price Here</h6>
23	<table class="table table-striped">	23	<table class="table table-striped">
24	<thead>	24	<thead>
25	<tr>	25	<tr>
26	<th> Product</th>	26	<th> Product</th>
27	<th> Cost</th>	27	<th> Cost</th>
28	<th> Margin</th>	28	<th> Margin</th>
29	<th> PAP(Total)</th>	29	<th> PAP(Total)</th>
30	<th> Date</th>	30	<th> Date</th>
31	</tr>	31	</tr>
32	</thead>	32	</thead>
33	<tbody>	33	<tbody>
34	<tr>	34	<tr>
35	<td>Name and inc.</td>	35	<td>Name and inc.</td>
36	<td><input type="text" class="form-control" style="height:31px;" name="name" id="name"></td>	36	<td><input type="text" class="form-control" style="height:31px;" name="name" id="name"></td>
37	<td><input type="text" class="form-control" style="height:31px;" name="name" id="name"></td>	37	<td><input type="text" class="form-control" style="height:31px;" name="name" id="name"></td>
38	<td>Jemmy</td>	38	<td>Jemmy</td>
39	<td><input type="text" class="form-control" style="height:31px;" name="name" id="name"></td>	39	<td><input type="text" class="form-control" style="height:31px;" name="name" id="name"></td>
40	</tr>	40	</tr>
41	<tr>	41	<tr>
42	<td>Name and inc.</td>	42	<td>Name and inc.</td>
43	<td><input type="text" class="form-control" style="height:31px;" name="name" id="name"></td>	43	<td><input type="text" class="form-control" style="height:31px;" name="name" id="name"></td>
44	<td><input type="text" class="form-control" style="height:31px;" name="name" id="name"></td>	44	<td><input type="text" class="form-control" style="height:31px;" name="name" id="name"></td>
45	<td>Jemmy</td>	45	<td>Jemmy</td>
46	<td><input type="text" class="form-control" style="height:31px;" name="name" id="name"></td>	46	<td><input type="text" class="form-control" style="height:31px;" name="name" id="name"></td>
47	</tr>	47	</tr>
48	</tbody>	48	</tbody>
49	</table>	49	</table>
50	<div class="row" style="margin-left: 0px;">	50	<div class="row" style="margin-left: 0px;">
51	<div class="col-md-12" style= "text-align: right;">	51	<div class="col-md-12" style= "text-align: right;">
52	<button type="button" class="btn btn-success btn-xs">Save</button>	52	<button type="button" class="btn btn-success btn-xs">Save</button>
53	</div>	53	</div>
54	</div>	54	</div>
55	</div>	55	</div>
56	<!-- /widget-content -->	56	<!-- /widget-content -->
57	</div>	57	</div>
58	<!-- /widget -->	58	<!-- /widget -->
59	</div>	59	</div>
60		60
61	<div class="col-md-7">	61	<div class="col-md-7">
62	<div class="widget stacked">	62	<div class="widget stacked">
63	<div class="widget-header">	63	<div class="widget-header">
64	<i class="fa fa-pencil"></i>	64	<i class="fa fa-pencil"></i>
65	<h3><b>JET-A</b> Customer Margin Template</h3>	65	<h3><b>JET-A</b> Customer Margin Template</h3>
66	<div class="pull-right">	66	<div class="pull-right">
67	<button type="submit" class="btn btn-success btn-sm" ng-click="addNewMarginBtn()" style="margin-top: 4px; margin-right: 10px;"><i class="icon-ok"></i>+ &nbsp Add Aircraft</button>	67	<button type="submit" class="btn btn-success btn-sm" ng-click="addNewMarginBtn()" style="margin-top: 4px; margin-right: 10px;"><i class="icon-ok"></i>+ &nbsp Add Aircraft</button>
68	</div>	68	</div>
69	</div>	69	</div>
70	<!-- /widget-header -->	70	<!-- /widget-header -->
71	<div class="widget-content">	71	<div class="widget-content">
72	<section id="accordions">	72	<section id="accordions">
73	<div class="newCustomAccordian">	73	<div class="newCustomAccordian">
74	<!-- tab 1 -->	74	<!-- tab 1 -->
75	<div ng-repeat="jets in aTypeJets">	75	<div ng-repeat="jets in aTypeJets">
76	<div class="customAccordianHeader" id="{{jets.id}}">	76	<div class="customAccordianHeader" id="{{jets.id}}">
77	<span>{{jets.marginName}}</span>	77	<span>{{jets.marginName}}</span>
78	<select class="form-control" disabled="true" ng-model="jets.pricingStructure">	78	<select class="form-control" disabled="true" ng-model="jets.pricingStructure">
79	<option value="" disabled selected>Pricing Structure</option>	79	<option value="" disabled selected>Pricing Structure</option>
80	<option value="minus">Retail-(minus)</option>	80	<option value="minus">Retail-(minus)</option>
81	<option value="plus">Cost+(plus)</option>	81	<option value="plus">Cost+(plus)</option>
82	<option value="equal">Direct=(equal)</option>	82	<option value="equal">Direct=(equal)</option>
83	</select>	83	</select>
84	<span style="margin-right: 0;">$</span>	84	<span style="margin-right: 0;">$</span>
85	<input type="text" disabled="true" class="form-control" ng-model="jets.marginValue">	85	<input type="text" disabled="true" class="form-control" ng-model="jets.marginValue">
86	<div class="pull-right">	86	<div class="pull-right">
87	<button class="btn btn-success" style="display: none;" ng-click="saveJetAccordian(jets)">Save</button>	87	<button class="btn btn-success" style="display: none;" ng-click="saveJetAccordian(jets)">Save</button>
88	<button class="btn btn-danger" style="display: none;" ng-click="deleteJetAccordian(jets.id)">Delete</button>	88	<button class="btn btn-danger" style="display: none;" ng-click="deleteJetAccordian(jets.id)">Delete</button>
89	<button class="btn btn-default" ng-click="toggleJestAccordian(jets.id)">Edit</button>	89	<button class="btn btn-default" ng-click="toggleJestAccordian(jets.id)">Edit</button>
90	</div>	90	</div>
91	<div class="clearfix"></div>	91	<div class="clearfix"></div>
92	</div>	92	</div>
93	<div class="customAccordianTabBody {{jets.id}}" style="display: none;">	93	<div class="customAccordianTabBody {{jets.id}}" style="display: none;">
94	<table class="customTableWithFilter">	94	<div class="tierListWrap" ng-repeat="tier in tierList">
95	<thead>	95	<div class="tierListHead" style="height: 36px;">
96	<tr>	96	<span class="pull-left tierHeadingSpan" ng-hide="showEditTier">{{tier.minTierBreak}}-{{tier.maxTierBreak}} gal.
97	<th>	97	</span>
98	<span class="pull-left">1-250 gal.</span>	98	<i class="fa fa-pencil-square-o pull-right" ng-click="showEditTier = ! showEditTier" ng-hide="showEditTier" style="margin-top: 5px; cursor: pointer;" aria-hidden="true"></i>
99	<i class="fa fa-pencil-square-o pull-right" aria-hidden="true"></i>	99
100	</th>	100	<input type="text" placeholder="min" style="width: 36px;" ng-model="tier.minTierBreak" ng-show="showEditTier">
101	<th>	101	<span ng-show="showEditTier">-</span>
102	<span class="pull-left">1-250 gal.</span>	102	<input type="text" placeholder="max" style="width: 36px;" ng-model="tier.maxTierBreak" ng-show="showEditTier"> <b ng-show="showEditTier">gal.</b>
103	<i class="fa fa-pencil-square-o pull-right" aria-hidden="true"></i>	103	<div class="clearfix"></div>
104	</th>	104	</div>
105	<th>	105	<div class="tierListBody" style="height: 35px;">
106	<input type="text" placeholder="min" name=""> -	106	<span class="pull-left minTierSpan" ng-hide="showEditTier">-${{tier.margin}}</span>
107	<input type="text" placeholder="max" name="">	107
108	<span>gal.</span>	108	<input type="text" placeholder="max" style="width: 36px;" ng-model="tier.margin" ng-show="showEditTier">
109	</th>	109
110	<th>   </th>	110	<span class="pull-right maxTierSpan" ng-hide="showEditTier">(${{tier.marginTotal}})</span>
111	</tr>	111
112	</thead>	112	<button class="addTierBtn" ng-click="editTier(tier)" ng-show="showEditTier">Save</button>
113	<tbody>	113
114	<tr>	114	<i class="fa fa-trash-o deleteTierIcon" ng-click="deleteTier(tier.id)" aria-hidden="true" ng-show="showEditTier"></i>
115	<td>	115
116	<span class="pull-left">-$0.0000</span>	116	<div class="clearfix"></div>
117	<span class="pull-right">($1.7500)</span>	117	</div>
118	</td>	118	</div>
119	<td>	119	<div class="tierListWrap" style="width: 160px;">
120	<span class="pull-left">-$0.0000</span>	120	<div class="tierListHead" style="border-right: 1px solid #ddd;">
121	<span class="pull-right">($1.7500)</span>	121	<input type="text" placeholder="min" ng-model="tr.minTierBreak">
122	</td>	122	<span>-</span>
123	<td>	123	<input type="text" placeholder="max" ng-model="tr.maxTierBreak"> <b>gal.</b>
124	<span>$</span>	124	<div class="clearfix"></div>
125	<input type="text" placeholder="margin" class="tierTextBox" name="">	125	</div>
126	<button class="addTierButton">Add Tier</button>	126	<div class="tierListBody" style="border-right: 1px solid #ddd;">
127	</td>	127	<span style="color: #449d44;">$</span>
128	<td>	128	<input type="text" placeholder="margin" ng-model="tr.margin" class="tierTextBox" style="width: 70px; height: 24px;">
129	<i class="fa fa-trash-o" aria-hidden="true"></i>	129	<button class="addTierBtn" ng-click="addNewTier(jets.id)">Add Tier</button>
130	</td>	130	<div class="clearfix"></div>
131	</tr>	131	</div>
132	</tbody>	132	</div>
133	</table>	133	<!-- <div class="tierListWrap" style="width: 32px;">
		134	<div class="tierListHead" style="height: 36px; border-right: 1px solid #ddd;">
		135
		136	</div>
		137	<div class="tierListBody" style="height: 35px; border-right: 1px solid #ddd;">
		138	<i class="fa fa-trash-o deleteTierIcon" aria-hidden="true"></i>
		139	</div>
		140	</div> -->
		141	<div class="clearfix"></div>
134	<textarea class="form-control resizeTextarea" placeholder="Message..."></textarea>	142	<textarea class="form-control resizeTextarea" placeholder="Message..."></textarea>
135	</div>	143	</div>
136	</div>	144	</div>
137		145
138	<!-- tab 2 -->	146	<!-- tab 2 -->
139		147
140	<!-- <div class="customAccordianHeader" id="customTabs2">	148	<!-- <div class="customAccordianHeader" id="customTabs2">
141	<span>Jet Aircraft</span>	149	<span>Jet Aircraft</span>
142	<select class="form-control" disabled="true">	150	<select class="form-control" disabled="true">
143	<option>Pricing Structure</option>	151	<option>Pricing Structure</option>
144	<option>Retail-(minus)</option>	152	<option>Retail-(minus)</option>
145	<option>Cost+(plus)</option>	153	<option>Cost+(plus)</option>
146	<option>Direct=(equals)</option>	154	<option>Direct=(equals)</option>
147	</select>	155	</select>
148	<input type="text" name="" disabled="true" class="form-control" value="$1.7500">	156	<input type="text" name="" disabled="true" class="form-control" value="$1.7500">
149	<div class="pull-right">	157	<div class="pull-right">
150	<button class="btn btn-success" style="display: none;">Save</button>	158	<button class="btn btn-success" style="display: none;">Save</button>
151	<button class="btn btn-danger" style="display: none;">Delete</button>	159	<button class="btn btn-danger" style="display: none;">Delete</button>
152	<button class="btn btn-default" id="customTabToggle2">Edit</button>	160	<button class="btn btn-default" id="customTabToggle2">Edit</button>
153	</div>	161	</div>
154	<div class="clearfix"></div>	162	<div class="clearfix"></div>
155	</div>	163	</div>
156	<div class="customAccordianTabBody" id="customTabsBody2" style="display: none;">	164	<div class="customAccordianTabBody" id="customTabsBody2" style="display: none;">
157	<table class="customTableWithFilter">	165	<table class="customTableWithFilter">
158	<thead>	166	<thead>
159	<tr>	167	<tr>
160	<th>	168	<th>
161	<span class="pull-left">1-250 gal.</span>	169	<span class="pull-left">1-250 gal.</span>
162	<i class="fa fa-pencil-square-o pull-right" aria-hidden="true"></i>	170	<i class="fa fa-pencil-square-o pull-right" aria-hidden="true"></i>
163	</th>	171	</th>
164	<th>	172	<th>
165	<span class="pull-left">1-250 gal.</span>	173	<span class="pull-left">1-250 gal.</span>
166	<i class="fa fa-pencil-square-o pull-right" aria-hidden="true"></i>	174	<i class="fa fa-pencil-square-o pull-right" aria-hidden="true"></i>
167	</th>	175	</th>
168	<th>	176	<th>
169	<input type="text" placeholder="min" name=""> -	177	<input type="text" placeholder="min" name=""> -
170	<input type="text" placeholder="max" name="">	178	<input type="text" placeholder="max" name="">
171	<span>gal.</span>	179	<span>gal.</span>
172	</th>	180	</th>
173	<th>   </th>	181	<th>   </th>
174	</tr>	182	</tr>
175	</thead>	183	</thead>
176	<tbody>	184	<tbody>
177	<tr>	185	<tr>
178	<td>	186	<td>
179	<span class="pull-left">-$0.0000</span>	187	<span class="pull-left">-$0.0000</span>
180	<span class="pull-right">($1.7500)</span>	188	<span class="pull-right">($1.7500)</span>
181	</td>	189	</td>
182	<td>	190	<td>
183	<span class="pull-left">-$0.0000</span>	191	<span class="pull-left">-$0.0000</span>
184	<span class="pull-right">($1.7500)</span>	192	<span class="pull-right">($1.7500)</span>
185	</td>	193	</td>
186	<td>	194	<td>
187	<span>$</span>	195	<span>$</span>
188	<input type="text" placeholder="margin" class="tierTextBox" name="">	196	<input type="text" placeholder="margin" class="tierTextBox" name="">
189	<button class="addTierButton">Add Tier</button>	197	<button class="addTierButton">Add Tier</button>
190	</td>	198	</td>
191	<td>	199	<td>
192	<i class="fa fa-trash-o" aria-hidden="true"></i>	200	<i class="fa fa-trash-o" aria-hidden="true"></i>
193	</td>	201	</td>
194	</tr>	202	</tr>
195	</tbody>	203	</tbody>
196	</table>	204	</table>
197	<textarea class="form-control resizeTextarea" placeholder="Message..."></textarea>	205	<textarea class="form-control resizeTextarea" placeholder="Message..."></textarea>
198	</div> -->	206	</div> -->
199		207
200	<!-- tab 3 -->	208	<!-- tab 3 -->
201		209
202	<!-- <div class="customAccordianHeader" id="customTabs3">	210	<!-- <div class="customAccordianHeader" id="customTabs3">
203	<span>Jet Aircraft</span>	211	<span>Jet Aircraft</span>
204	<select class="form-control" disabled="true">	212	<select class="form-control" disabled="true">
205	<option>Pricing Structure</option>	213	<option>Pricing Structure</option>
206	<option>Retail-(minus)</option>	214	<option>Retail-(minus)</option>
207	<option>Cost+(plus)</option>	215	<option>Cost+(plus)</option>
208	<option>Direct=(equals)</option>	216	<option>Direct=(equals)</option>
209	</select>	217	</select>
210	<input type="text" name="" disabled="true" class="form-control" value="$1.7500">	218	<input type="text" name="" disabled="true" class="form-control" value="$1.7500">
211	<div class="pull-right">	219	<div class="pull-right">
212	<button class="btn btn-success" style="display: none;">Save</button>	220	<button class="btn btn-success" style="display: none;">Save</button>
213	<button class="btn btn-danger" style="display: none;">Delete</button>	221	<button class="btn btn-danger" style="display: none;">Delete</button>
214	<button class="btn btn-default" id="customTabToggle3">Edit</button>	222	<button class="btn btn-default" id="customTabToggle3">Edit</button>
215	</div>	223	</div>
216	<div class="clearfix"></div>	224	<div class="clearfix"></div>
217	</div>	225	</div>
218	<div class="customAccordianTabBody" id="customTabsBody3" style="display: none;">	226	<div class="customAccordianTabBody" id="customTabsBody3" style="display: none;">
219	<table class="customTableWithFilter">	227	<table class="customTableWithFilter">
220	<thead>	228	<thead>
221	<tr>	229	<tr>
222	<th>	230	<th>
223	<span class="pull-left">1-250 gal.</span>	231	<span class="pull-left">1-250 gal.</span>
224	<i class="fa fa-pencil-square-o pull-right" aria-hidden="true"></i>	232	<i class="fa fa-pencil-square-o pull-right" aria-hidden="true"></i>
225	</th>	233	</th>
226	<th>	234	<th>
227	<span class="pull-left">1-250 gal.</span>	235	<span class="pull-left">1-250 gal.</span>
228	<i class="fa fa-pencil-square-o pull-right" aria-hidden="true"></i>	236	<i class="fa fa-pencil-square-o pull-right" aria-hidden="true"></i>
229	</th>	237	</th>
230	<th>	238	<th>
231	<input type="text" placeholder="min" name=""> -	239	<input type="text" placeholder="min" name=""> -
232	<input type="text" placeholder="max" name="">	240	<input type="text" placeholder="max" name="">
233	<span>gal.</span>	241	<span>gal.</span>
234	</th>	242	</th>
235	<th>   </th>	243	<th>   </th>
236	</tr>	244	</tr>
237	</thead>	245	</thead>
238	<tbody>	246	<tbody>
239	<tr>	247	<tr>
240	<td>	248	<td>
241	<span class="pull-left">-$0.0000</span>	249	<span class="pull-left">-$0.0000</span>
242	<span class="pull-right">($1.7500)</span>	250	<span class="pull-right">($1.7500)</span>
243	</td>	251	</td>
244	<td>	252	<td>
245	<span class="pull-left">-$0.0000</span>	253	<span class="pull-left">-$0.0000</span>
246	<span class="pull-right">($1.7500)</span>	254	<span class="pull-right">($1.7500)</span>
247	</td>	255	</td>
248	<td>	256	<td>
249	<span>$</span>	257	<span>$</span>
250	<input type="text" placeholder="margin" class="tierTextBox" name="">	258	<input type="text" placeholder="margin" class="tierTextBox" name="">
251	<button class="addTierButton">Add Tier</button>	259	<button class="addTierButton">Add Tier</button>
252	</td>	260	</td>
253	<td>	261	<td>
254	<i class="fa fa-trash-o" aria-hidden="true"></i>	262	<i class="fa fa-trash-o" aria-hidden="true"></i>
255	</td>	263	</td>
256	</tr>	264	</tr>
257	</tbody>	265	</tbody>
258	</table>	266	</table>
259	<textarea class="form-control resizeTextarea" placeholder="Message..."></textarea>	267	<textarea class="form-control resizeTextarea" placeholder="Message..."></textarea>
260	</div> -->	268	</div> -->
261		269
262	<!-- tab 4 -->	270	<!-- tab 4 -->
263		271
264	<!-- <div class="customAccordianHeader" id="customTabs4">	272	<!-- <div class="customAccordianHeader" id="customTabs4">
265	<span>Jet Aircraft</span>	273	<span>Jet Aircraft</span>
266	<select class="form-control" disabled="true">	274	<select class="form-control" disabled="true">
267	<option>Pricing Structure</option>	275	<option>Pricing Structure</option>
268	<option>Retail-(minus)</option>	276	<option>Retail-(minus)</option>
269	<option>Cost+(plus)</option>	277	<option>Cost+(plus)</option>
270	<option>Direct=(equals)</option>	278	<option>Direct=(equals)</option>
271	</select>	279	</select>
272	<input type="text" name="" disabled="true" class="form-control" value="$1.7500">	280	<input type="text" name="" disabled="true" class="form-control" value="$1.7500">
273	<div class="pull-right">	281	<div class="pull-right">
274	<button class="btn btn-success" style="display: none;">Save</button>	282	<button class="btn btn-success" style="display: none;">Save</button>
275	<button class="btn btn-danger" style="display: none;">Delete</button>	283	<button class="btn btn-danger" style="display: none;">Delete</button>
276	<button class="btn btn-default" id="customTabToggle4">Edit</button>	284	<button class="btn btn-default" id="customTabToggle4">Edit</button>
277	</div>	285	</div>
278	<div class="clearfix"></div>	286	<div class="clearfix"></div>
279	</div>	287	</div>
280	<div class="customAccordianTabBody" id="customTabsBody4" style="display: none;">	288	<div class="customAccordianTabBody" id="customTabsBody4" style="display: none;">
281	<table class="customTableWithFilter">	289	<table class="customTableWithFilter">
282	<thead>	290	<thead>
283	<tr>	291	<tr>
284	<th>	292	<th>
285	<span class="pull-left">1-250 gal.</span>	293	<span class="pull-left">1-250 gal.</span>
286	<i class="fa fa-pencil-square-o pull-right" aria-hidden="true"></i>	294	<i class="fa fa-pencil-square-o pull-right" aria-hidden="true"></i>
287	</th>	295	</th>
288	<th>	296	<th>
289	<span class="pull-left">1-250 gal.</span>	297	<span class="pull-left">1-250 gal.</span>
290	<i class="fa fa-pencil-square-o pull-right" aria-hidden="true"></i>	298	<i class="fa fa-pencil-square-o pull-right" aria-hidden="true"></i>
291	</th>	299	</th>
292	<th>	300	<th>
293	<input type="text" placeholder="min" name=""> -	301	<input type="text" placeholder="min" name=""> -
294	<input type="text" placeholder="max" name="">	302	<input type="text" placeholder="max" name="">
295	<span>gal.</span>	303	<span>gal.</span>
296	</th>	304	</th>
297	<th>   </th>	305	<th>   </th>
298	</tr>	306	</tr>
299	</thead>	307	</thead>
300	<tbody>	308	<tbody>
301	<tr>	309	<tr>
302	<td>	310	<td>
303	<span class="pull-left">-$0.0000</span>	311	<span class="pull-left">-$0.0000</span>
304	<span class="pull-right">($1.7500)</span>	312	<span class="pull-right">($1.7500)</span>
305	</td>	313	</td>
306	<td>	314	<td>
307	<span class="pull-left">-$0.0000</span>	315	<span class="pull-left">-$0.0000</span>
308	<span class="pull-right">($1.7500)</span>	316	<span class="pull-right">($1.7500)</span>
309	</td>	317	</td>
310	<td>	318	<td>
311	<span>$</span>	319	<span>$</span>
312	<input type="text" placeholder="margin" class="tierTextBox" name="">	320	<input type="text" placeholder="margin" class="tierTextBox" name="">
313	<button class="addTierButton">Add Tier</button>	321	<button class="addTierButton">Add Tier</button>
314	</td>	322	</td>
315	<td>	323	<td>
316	<i class="fa fa-trash-o" aria-hidden="true"></i>	324	<i class="fa fa-trash-o" aria-hidden="true"></i>
317	</td>	325	</td>
318	</tr>	326	</tr>
319	</tbody>	327	</tbody>
320	</table>	328	</table>
321	<textarea class="form-control resizeTextarea" placeholder="Message..."></textarea>	329	<textarea class="form-control resizeTextarea" placeholder="Message..."></textarea>
322	</div> -->	330	</div> -->
323		331
324		332
325	</div>	333	</div>
326	</section>	334	</section>
327	<div class="row"> </div>	335	<div class="row"> </div>
328	<div class="row">	336	<div class="row">
329	<div class="form-group">	337	<div class="form-group">
330	<div class="col-lg-12 text-right">	338	<div class="col-lg-12 text-right">
331	<button type="submit" class="btn btn-success"><i class="icon-ok"></i> Save Form</button>	339	<button type="submit" class="btn btn-success"><i class="icon-ok"></i> Save Form</button>
332	<button type="reset" class="btn btn-default">Cancel</button>	340	<button type="reset" class="btn btn-default">Cancel</button>
333	</div>	341	</div>
334	</div>	342	</div>
335	</div>	343	</div>
336	</div>	344	</div>
337	<!-- /widget-content -->	345	<!-- /widget-content -->
338	</div>	346	</div>
339	<!-- /widget -->	347	<!-- /widget -->
340	</div>	348	</div>
341	<!-- /span6 -->	349	<!-- /span6 -->
342	</div>	350	</div>
343	<!-- /span12 -->	351	<!-- /span12 -->
344	</div>	352	</div>
345	<!-- /row -->	353	<!-- /row -->
346	<div class="container">	354	<div class="container">
347	<div class="row">	355	<div class="row">
348	<div class="col-md-5">	356	<div class="col-md-5">
349	<div class="widget stacked">	357	<div class="widget stacked">
350	<div class="widget-header">	358	<div class="widget-header">
351	<i class="fa fa-pencil"></i>	359	<i class="fa fa-pencil"></i>
352	<h3>Queue Future Pricing </h3>	360	<h3>Queue Future Pricing </h3>
353	<!-- <select style="float: right;margin:10px;background-color:#cd7b00;">	361	<!-- <select style="float: right;margin:10px;background-color:#cd7b00;">
354	<option>Send Pricing Email</option>	362	<option>Send Pricing Email</option>
355	<option>Margin 1</option>	363	<option>Margin 1</option>
356	<option>Margin 2</option>	364	<option>Margin 2</option>
357	<option>Margin Tenants</option>	365	<option>Margin Tenants</option>
358	</select> -->	366	</select> -->
359	</div>	367	</div>
360	<!-- /widget-header -->	368	<!-- /widget-header -->
361	<div class="widget-content">	369	<div class="widget-content">
362	<h6>Queue Future Fuel Pricing Here</h6>	370	<h6>Queue Future Fuel Pricing Here</h6>
363	<table class="table table-striped">	371	<table class="table table-striped">
364	<thead>	372	<thead>
365	<tr>	373	<tr>
366	<th> Product</th>	374	<th> Product</th>
367	<th> Cost</th>	375	<th> Cost</th>
368	<th>PAP(Total)</th>	376	<th>PAP(Total)</th>
369	<th>Deploy</th>	377	<th>Deploy</th>
370	<th>Next Expiration</th>	378	<th>Next Expiration</th>
371	</tr>	379	</tr>
372	</thead>	380	</thead>
373	<tbody>	381	<tbody>
374	<tr>	382	<tr>
375	<td>Name and inc.</td>	383	<td>Name and inc.</td>
376	<td><input type="text" class="form-control" style="height:31px;" name="name" id="name"></td>	384	<td><input type="text" class="form-control" style="height:31px;" name="name" id="name"></td>
377	<td><input type="text" class="form-control" style="height:31px;" name="name" id="name"></td>	385	<td><input type="text" class="form-control" style="height:31px;" name="name" id="name"></td>
378	<td>Jemmy</td>	386	<td>Jemmy</td>
379	<td><input type="text" class="form-control" style="height:31px;" name="name" id="name"></td>	387	<td><input type="text" class="form-control" style="height:31px;" name="name" id="name"></td>
380	</tr>	388	</tr>
381	<tr>	389	<tr>
382	<td>Name and inc.</td>	390	<td>Name and inc.</td>
383	<td><input type="text" class="form-control" style="height:31px;" name="name" id="name"></td>	391	<td><input type="text" class="form-control" style="height:31px;" name="name" id="name"></td>
384	<td><input type="text" class="form-control" style="height:31px;" name="name" id="name"></td>	392	<td><input type="text" class="form-control" style="height:31px;" name="name" id="name"></td>
385	<td>Jemmy</td>	393	<td>Jemmy</td>
386	<td><input type="text" class="form-control" style="height:31px;" name="name" id="name"></td>	394	<td><input type="text" class="form-control" style="height:31px;" name="name" id="name"></td>
387	</tr>	395	</tr>
388	</tbody>	396	</tbody>
389	</table>	397	</table>
390	<div class="row" style="margin-left: 0px;">	398	<div class="row" style="margin-left: 0px;">
391	<div class="col-md-12" style= "text-align: right;">	399	<div class="col-md-12" style= "text-align: right;">
392	<button type="button" class="btn btn-success btn-xs">Save</button>	400	<button type="button" class="btn btn-success btn-xs">Save</button>
393	</div>	401	</div>
394	</div>	402	</div>
395	</div>	403	</div>
396	<!-- /widget-content -->	404	<!-- /widget-content -->
397	</div>	405	</div>
398	<!-- /widget -->	406	<!-- /widget -->
399	</div>	407	</div>
400	<div class="col-md-7">	408	<div class="col-md-7">
401	<div class="widget stacked">	409	<div class="widget stacked">
402	<div class="widget-header">	410	<div class="widget-header">
403	<i class="fa fa-pencil"></i>	411	<i class="fa fa-pencil"></i>
404	<h3><b>JET-A</b> Customer Margin Template</h3>	412	<h3><b>JET-A</b> Customer Margin Template</h3>
405	<div class="pull-right">	413	<div class="pull-right">
406	<button type="submit" class="btn btn-success btn-sm"><i class="icon-ok"></i>+ &nbsp Add Aircraft</button>	414	<button type="submit" class="btn btn-success btn-sm"><i class="icon-ok"></i>+ &nbsp Add Aircraft</button>
407	</div>	415	</div>
408	</div>	416	</div>
409	<!-- /widget-header -->	417	<!-- /widget-header -->
410	<div class="widget-content">	418	<div class="widget-content">
411	<!-- <section id="accordions">	419	<!-- <section id="accordions">
412	<div class="panel-group accordion">	420	<div class="panel-group accordion">
413	<div class="panel panel-default open">	421	<div class="panel panel-default open">
414	<div class="panel-heading">	422	<div class="panel-heading">
415	<h4 class="panel-title">	423	<h4 class="panel-title">
416	<a class="accordion-toggle" style="float:left;" data-toggle="collapse" data-parent=".accordion" href="#collapseOne">	424	<a class="accordion-toggle" style="float:left;" data-toggle="collapse" data-parent=".accordion" href="#collapseOne">
417	Margin 1	425	Margin 1
418	</a>	426	</a>
419	<span style="color:#ff9900;font-size:12px;margin-left:50px">Retail- (minus) </span><span style="font-size:12px">$1.1500</span>	427	<span style="color:#ff9900;font-size:12px;margin-left:50px">Retail- (minus) </span><span style="font-size:12px">$1.1500</span>
420	</h4>	428	</h4>
421	</div>	429	</div>
422	<div id="collapseOne" class="panel-collapse collapse in">	430	<div id="collapseOne" class="panel-collapse collapse in">
423	<div class="panel-body">	431	<div class="panel-body">
424	<div id="editor2" style="visibility: hidden;">	432	<div id="editor2" style="visibility: hidden;">
425	</div>	433	</div>
426	</div>	434	</div>
427	</div>	435	</div>
428	</div>	436	</div>
429	<div class="panel panel-default">	437	<div class="panel panel-default">
430	<div class="panel-heading">	438	<div class="panel-heading">
431	<h4 class="panel-title">	439	<h4 class="panel-title">
432	<a class="accordion-toggle" data-toggle="collapse" data-parent=".accordion" href="#collapseTwo">	440	<a class="accordion-toggle" data-toggle="collapse" data-parent=".accordion" href="#collapseTwo">
433	TurboPop AirCraft	441	TurboPop AirCraft
434	</a>	442	</a>
435	</h4>	443	</h4>
436	</div>	444	</div>
437	<div id="collapseTwo" class="panel-collapse collapse">	445	<div id="collapseTwo" class="panel-collapse collapse">
438	<div class="panel-body">	446	<div class="panel-body">
439	<div class="row" style="margin-left: 0px;">	447	<div class="row" style="margin-left: 0px;">
440	<div class="col-md-8">	448	<div class="col-md-8">
441	<div class="row" style="margin-bottom: 5px;">	449	<div class="row" style="margin-bottom: 5px;">
442	<div class="col-md-1" style="text-align: right;">	450	<div class="col-md-1" style="text-align: right;">
443	<h5 style="color: blue;font-weight: bold;">Omit</h5>	451	<h5 style="color: blue;font-weight: bold;">Omit</h5>
444	</div>	452	</div>
445	<div class="col-md-5">	453	<div class="col-md-5">
446	<h5 style="color: blue;font-weight: bold;">AirCraft Size</h5>	454	<h5 style="color: blue;font-weight: bold;">AirCraft Size</h5>
447	</div>	455	</div>
448	<div class="col-md-3">	456	<div class="col-md-3">
449	<h5 style="color: blue;font-weight: bold;">Ramp/Facility Fee</h5>	457	<h5 style="color: blue;font-weight: bold;">Ramp/Facility Fee</h5>
450	</div>	458	</div>
451	<div class="col-md-3">	459	<div class="col-md-3">
452	<h5 style="color: blue;font-weight: bold;">Avoidance</h5>	460	<h5 style="color: blue;font-weight: bold;">Avoidance</h5>
453	</div>	461	</div>
454	</div>	462	</div>
455	<div class="row" style="margin-bottom: 5px;">	463	<div class="row" style="margin-bottom: 5px;">
456	<div class="col-md-1" style="text-align: right;">	464	<div class="col-md-1" style="text-align: right;">
457	<input type="checkbox" name="validateCheckbox" value="1">	465	<input type="checkbox" name="validateCheckbox" value="1">
458	</div>	466	</div>
459	<div class="col-md-5">	467	<div class="col-md-5">
460	<p>Very Light Jet	468	<p>Very Light Jet
461	</p>	469	</p>
462	</div>	470	</div>
463	<div class="col-md-3">	471	<div class="col-md-3">
464	<input type="text" class="form-control" name="name" id="name">	472	<input type="text" class="form-control" name="name" id="name">
465	</div>	473	</div>
466	<div class="col-md-3">	474	<div class="col-md-3">
467	<input type="text" class="form-control" name="name" id="name">	475	<input type="text" class="form-control" name="name" id="name">
468	</div>	476	</div>
469	</div>	477	</div>
470	<div class="row" style="margin-bottom: 5px;">	478	<div class="row" style="margin-bottom: 5px;">
471	<div class="col-md-1" style="text-align: right;">	479	<div class="col-md-1" style="text-align: right;">
472	<input type="checkbox" name="validateCheckbox" value="1">	480	<input type="checkbox" name="validateCheckbox" value="1">
473	</div>	481	</div>
474	<div class="col-md-5">	482	<div class="col-md-5">
475	<p> Light Jet	483	<p> Light Jet
476	</p>	484	</p>
477	</div>	485	</div>
478	<div class="col-md-3">	486	<div class="col-md-3">
479	<input type="text" class="form-control" name="name" id="name">	487	<input type="text" class="form-control" name="name" id="name">
480	</div>	488	</div>
481	<div class="col-md-3">	489	<div class="col-md-3">
482	<input type="text" class="form-control" name="name" id="name">	490	<input type="text" class="form-control" name="name" id="name">
483	</div>	491	</div>
484	</div>	492	</div>
485	</div>	493	</div>
486	<div class="col-md-4">	494	<div class="col-md-4">
487	</div>	495	</div>
488	</div>	496	</div>
489	</div>	497	</div>
490	</div>	498	</div>
491	</div>	499	</div>
492	<div class="panel panel-default">	500	<div class="panel panel-default">
493	<div class="panel-heading">	501	<div class="panel-heading">
494	<h4 class="panel-title">	502	<h4 class="panel-title">
495	<a class="accordion-toggle" data-toggle="collapse" data-parent=".accordion" href="#collapseThree">	503	<a class="accordion-toggle" data-toggle="collapse" data-parent=".accordion" href="#collapseThree">
496	Collapsible Group Item #3	504	Collapsible Group Item #3
497	</a>	505	</a>
498	</h4>	506	</h4>
499	</div>	507	</div>
500	<div id="collapseThree" class="panel-collapse collapse">	508	<div id="collapseThree" class="panel-collapse collapse">
501	<div class="panel-body">	509	<div class="panel-body">
502	Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.	510	Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
503	</div>	511	</div>
504	</div>	512	</div>
505	</div>	513	</div>
506	</div>	514	</div>
507	</section> -->	515	</section> -->
508	<uib-accordion close-others="oneAtATime">	516	<uib-accordion close-others="oneAtATime">
509	<div uib-accordion-group class="panel-default" heading="Margin 1 Retail- (minus) $1.1500">	517	<div uib-accordion-group class="panel-default" heading="Margin 1 Retail- (minus) $1.1500">
510	<div id="editor2" style="visibility: hidden;"></div>	518	<div id="editor2" style="visibility: hidden;"></div>
511	</div>	519	</div>
512	<div uib-accordion-group class="panel-default" heading="TurboPop AirCraft">	520	<div uib-accordion-group class="panel-default" heading="TurboPop AirCraft">
513	<div class="panel-body">	521	<div class="panel-body">
514	<div class="row" style="margin-left: 0px;">	522	<div class="row" style="margin-left: 0px;">
515	<div class="col-md-8">	523	<div class="col-md-8">
516	<div class="row" style="margin-bottom: 5px;">	524	<div class="row" style="margin-bottom: 5px;">
517	<div class="col-md-1" style="text-align: right;">	525	<div class="col-md-1" style="text-align: right;">
518	<h5 style="color: blue;font-weight: bold;">Omit</h5>	526	<h5 style="color: blue;font-weight: bold;">Omit</h5>
519	</div>	527	</div>
520	<div class="col-md-5">	528	<div class="col-md-5">
521	<h5 style="color: blue;font-weight: bold;">AirCraft Size</h5>	529	<h5 style="color: blue;font-weight: bold;">AirCraft Size</h5>
522	</div>	530	</div>
523	<div class="col-md-3">	531	<div class="col-md-3">
524	<h5 style="color: blue;font-weight: bold;">Ramp/Facility Fee</h5>	532	<h5 style="color: blue;font-weight: bold;">Ramp/Facility Fee</h5>
525	</div>	533	</div>
526	<div class="col-md-3">	534	<div class="col-md-3">
527	<h5 style="color: blue;font-weight: bold;">Avoidance</h5>	535	<h5 style="color: blue;font-weight: bold;">Avoidance</h5>
528	</div>	536	</div>
529	</div>	537	</div>
530	<div class="row" style="margin-bottom: 5px;">	538	<div class="row" style="margin-bottom: 5px;">
531	<div class="col-md-1" style="text-align: right;">	539	<div class="col-md-1" style="text-align: right;">
532	<input type="checkbox" name="validateCheckbox" value="1">	540	<input type="checkbox" name="validateCheckbox" value="1">
533	</div>	541	</div>
534	<div class="col-md-5">	542	<div class="col-md-5">
535	<p>Very Light Jet	543	<p>Very Light Jet
536	</p>	544	</p>
537	</div>	545	</div>
538	<div class="col-md-3">	546	<div class="col-md-3">
539	<input type="text" class="form-control" name="name" id="name">	547	<input type="text" class="form-control" name="name" id="name">
540	</div>	548	</div>
541	<div class="col-md-3">	549	<div class="col-md-3">
542	<input type="text" class="form-control" name="name" id="name">	550	<input type="text" class="form-control" name="name" id="name">
543	</div>	551	</div>
544	</div>	552	</div>
545	<div class="row" style="margin-bottom: 5px;">	553	<div class="row" style="margin-bottom: 5px;">
546	<div class="col-md-1" style="text-align: right;">	554	<div class="col-md-1" style="text-align: right;">
547	<input type="checkbox" name="validateCheckbox" value="1">	555	<input type="checkbox" name="validateCheckbox" value="1">
548	</div>	556	</div>
549	<div class="col-md-5">	557	<div class="col-md-5">
550	<p> Light Jet	558	<p> Light Jet
551	</p>	559	</p>
552	</div>	560	</div>
553	<div class="col-md-3">	561	<div class="col-md-3">
554	<input type="text" class="form-control" name="name" id="name">	562	<input type="text" class="form-control" name="name" id="name">
555	</div>	563	</div>
556	<div class="col-md-3">	564	<div class="col-md-3">
557	<input type="text" class="form-control" name="name" id="name">	565	<input type="text" class="form-control" name="name" id="name">
558	</div>	566	</div>
559	</div>	567	</div>
560	</div>	568	</div>
561	<div class="col-md-4">	569	<div class="col-md-4">
562	</div>	570	</div>
563	</div>	571	</div>
564	</div>	572	</div>
565	</div>	573	</div>
566	<div uib-accordion-group class="panel-default" heading="Collapsible Group Item #3">	574	<div uib-accordion-group class="panel-default" heading="Collapsible Group Item #3">
567	Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.	575	Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus terry richardson ad squid. 3 wolf moon officia aute, non cupidatat skateboard dolor brunch. Food truck quinoa nesciunt laborum eiusmod. Brunch 3 wolf moon tempor, sunt aliqua put a bird on it squid single-origin coffee nulla assumenda shoreditch et. Nihil anim keffiyeh helvetica, craft beer labore wes anderson cred nesciunt sapiente ea proident. Ad vegan excepteur butcher vice lomo. Leggings occaecat craft beer farm-to-table, raw denim aesthetic synth nesciunt you probably haven't heard of them accusamus labore sustainable VHS.
568	</div>	576	</div>
569	</uib-accordion>	577	</uib-accordion>
570	</div>	578	</div>
571	<!-- /widget-content -->	579	<!-- /widget-content -->
572	</div>	580	</div>
573	<!-- /widget -->	581	<!-- /widget -->
574	</div>	582	</div>
575	<!-- /span6 -->	583	<!-- /span6 -->
576	</div>	584	</div>
577	</div>	585	</div>
578	</div>	586	</div>
579	</div> <!-- /container -->	587	</div> <!-- /container -->
580		588
581		589
582	<div class="addNewMargin" style="display: none;">	590	<div class="addNewMargin" style="display: none;">
583	<div class="customBackdrop">	591	<div class="customBackdrop">
584	<div class="customModalInner" style="max-width: 700px;">	592	<div class="customModalInner" style="max-width: 700px;">
585	<div class="customModelHead">	593	<div class="customModelHead">
586	<p class="pull-left">	594	<p class="pull-left">
587	<i class="fa fa-list-alt" aria-hidden="true"></i>	595	<i class="fa fa-list-alt" aria-hidden="true"></i>
588	Add New JET-A Customer Margin	596	Add New JET-A Customer Margin
589	</p>	597	</p>
590	<p class="pull-right">	598	<p class="pull-right">
591	<i class="fa fa-times" aria-hidden="true" style="cursor: pointer;" ng-click="closeMarginPopup()"></i>	599	<i class="fa fa-times" aria-hidden="true" style="cursor: pointer;" ng-click="closeMarginPopup()"></i>
592	</p>	600	</p>
593	<div class="clearfix"></div>	601	<div class="clearfix"></div>
594	</div>	602	</div>
595	<div class="customModelBody">	603	<div class="customModelBody">
596		604
597	<div class="customAccordianHeader customActive">	605	<div class="customAccordianHeader customActive">
598	<input type="text" class="form-control" style="width: 120px; margin-right: 10px;" placeholder="Margin Name" ng-model="newJet.marginName">	606	<input type="text" class="form-control" style="width: 120px; margin-right: 10px;" placeholder="Margin Name" ng-model="newJet.marginName">
599	<select class="form-control" ng-model="newJet.pricingStructure">	607	<select class="form-control" ng-model="newJet.pricingStructure">
600	<option value="" disabled selected>Pricing Structure</option>	608	<option value="" disabled selected>Pricing Structure</option>
601	<option value="minus">Retail-(minus)</option>	609	<option value="minus">Retail-(minus)</option>
602	<option value="plus">Cost+(plus)</option>	610	<option value="plus">Cost+(plus)</option>
603	<option value="equal">Direct=(equal)</option>	611	<option value="equal">Direct=(equal)</option>
604	</select>	612	</select>
605	<span style="margin-right: 0;">$</span>	613	<span style="margin-right: 0;">$</span>
606	<input type="text" class="form-control" style="width: 120px;" placeholder="Margin Price" ng-model="newJet.marginValue">	614	<input type="text" class="form-control" style="width: 120px;" placeholder="Margin Price" ng-model="newJet.marginValue">
607	<div class="clearfix"></div>	615	<div class="clearfix"></div>
608	</div>	616	</div>
609	<div class="customAccordianTabBody">	617	<div class="customAccordianTabBody">
610	<textarea class="form-control resizeTextarea" placeholder="Message..."></textarea>	618	<textarea class="form-control resizeTextarea" placeholder="Message..."></textarea>
611	</div>	619	</div>
612		620
613	</div>	621	</div>
614	<div class="customModelFooter text-center">	622	<div class="customModelFooter text-center">
615	<input type="submit" value="Save" class="btn" ng-click="addNewATypeJet()">	623	<input type="submit" value="Save" class="btn" ng-click="addNewATypeJet()">
616	<button class="btn" ng-click="closeMarginPopup()">Cancel</button>	624	<button class="btn" ng-click="closeMarginPopup()">Cancel</button>
617	</div>	625	</div>
618	</div>	626	</div>
619	</div>	627	</div>
620	</div>	628	</div>
621		629
622		630
623	<!-- Le javascript	631	<!-- Le javascript
624	================================================== -->	632	================================================== -->
625	<!-- Placed at the end of the document so the pages load faster -->	633	<!-- Placed at the end of the document so the pages load faster -->
626	<!-- <script>	634	<!-- <script>
627	CKEDITOR.replace( 'editor2', {	635	CKEDITOR.replace( 'editor2', {
628	height: 250,	636	height: 250,
629	extraPlugins: 'divarea'	637	extraPlugins: 'divarea'
630	} );	638	} );
631	</script> -->	639	</script> -->

app/partials/updateFuelManager/updateFuelManager.service.js

Diff comments View file @05c2f6f

1	(function(){	1	(function(){
2	'use strict';	2	'use strict';
3	angular.module('acufuel')	3	angular.module('acufuel')
4	.service('updateFuelManagerService', ['$q', '$http', 'BASE_URL', updateFuelManagerService]);	4	.service('updateFuelManagerService', ['$q', '$http', 'BASE_URL', updateFuelManagerService]);
5		5
6	function updateFuelManagerService($q, $http, BASE_URL) {	6	function updateFuelManagerService($q, $http, BASE_URL) {
7	var temp = {};	7	var temp = {};
8		8
9	this.getATypeJets = function(id) {	9	this.getATypeJets = function(id) {
10		10
11	var deferred = $q.defer();	11	var deferred = $q.defer();
12	$http({	12	$http({
13	method : 'GET',	13	method : 'GET',
14	url : BASE_URL.url +'/margin/getJetAType/'+id,	14	url : BASE_URL.url +'/margin/getJetAType/'+id,
15	headers : {'Content-Type': 'application/json'},	15	headers : {'Content-Type': 'application/json'},
16	})	16	})
17	.then(function (result){	17	.then(function (result){
18	deferred.resolve(result.data);	18	deferred.resolve(result.data);
19	},function (result){	19	},function (result){
20	deferred.resolve(result.data);	20	deferred.resolve(result.data);
21	})	21	})
22	return deferred.promise;	22	return deferred.promise;
23	}	23	}
24		24
25	this.addNewAtypeJetMargin = function(data){	25	this.addNewAtypeJetMargin = function(data){
26	var deferred = $q.defer();	26	var deferred = $q.defer();
27	$http({	27	$http({
28	method : 'POST',	28	method : 'POST',
29	url : BASE_URL.url +'/margin',	29	url : BASE_URL.url +'/margin',
30	headers : {'Content-Type': 'application/json'},	30	headers : {'Content-Type': 'application/json'},
31	data: data	31	data: data
32	})	32	})
33	.then(function (result){	33	.then(function (result){
34	deferred.resolve(result.data);	34	deferred.resolve(result.data);
35	},function (result){	35	},function (result){
36	deferred.resolve(result.data);	36	deferred.resolve(result.data);
37	})	37	})
38	return deferred.promise;	38	return deferred.promise;
39	}	39	}
40		40
41	this.editAtypeJetMargin = function(data){	41	this.editAtypeJetMargin = function(data){
42	var deferred = $q.defer();	42	var deferred = $q.defer();
43	$http({	43	$http({
44	method : 'PUT',	44	method : 'PUT',
45	url : BASE_URL.url +'/margin',	45	url : BASE_URL.url +'/margin',
46	headers : {'Content-Type': 'application/json'},	46	headers : {'Content-Type': 'application/json'},
47	data: data	47	data: data
48	})	48	})
49	.then(function (result){	49	.then(function (result){
50	deferred.resolve(result.data);	50	deferred.resolve(result.data);
51	},function (result){	51	},function (result){
52	deferred.resolve(result.data);	52	deferred.resolve(result.data);
53	})	53	})
54	return deferred.promise;	54	return deferred.promise;
55	}	55	}
		56
		57	this.getJetTiers = function(id) {
		58
		59	var deferred = $q.defer();
		60	$http({
		61	method : 'GET',
		62	url : BASE_URL.url +'/margin/getCustomMargins/'+id,
		63	headers : {'Content-Type': 'application/json'},
		64	})
		65	.then(function (result){
		66	deferred.resolve(result.data);
		67	},function (result){
		68	deferred.resolve(result.data);
		69	})
		70	return deferred.promise;
		71	}
		72
		73	this.addNewTier = function(data){
		74	var deferred = $q.defer();
		75	$http({
		76	method : 'POST',
		77	url : BASE_URL.url +'/margin/custom',
		78	headers : {'Content-Type': 'application/json'},
		79	data: data
		80	})
		81	.then(function (result){
		82	deferred.resolve(result.data);
		83	},function (result){
		84	deferred.resolve(result.data);
		85	})
		86	return deferred.promise;
		87	}
		88
		89	this.editTier = function(data){
		90	var deferred = $q.defer();
		91	$http({
		92	method : 'PUT',
		93	url : BASE_URL.url +'/margin/custom',
		94	headers : {'Content-Type': 'application/json'},
		95	data: data
		96	})
		97	.then(function (result){
		98	deferred.resolve(result.data);
		99	},function (result){
		100	deferred.resolve(result.data);
		101	})
		102	return deferred.promise;
		103	}
		104
		105	this.deleteTier = function(id) {
		106
		107	var deferred = $q.defer();
		108	$http({
		109	method : 'DELETE',
		110	url : BASE_URL.url +'/margin/customMargins/'+id,
		111	headers : {'Content-Type': 'application/json'},
		112	})
		113	.then(function (result){
		114	deferred.resolve(result.data);
		115	},function (result){
		116	deferred.resolve(result.data);
		117	})
		118	return deferred.promise;
		119	}
56		120
57	}	121	}
58		122
59	})();	123	})();