This commit is contained in:
bitbucket 2023-11-22 11:03:18 +05:30
parent c8f9d33dc5
commit 25ffa9c641
4 changed files with 7 additions and 6 deletions

View File

@ -142,9 +142,9 @@
</div> </div>
<div class="col-6 col-md-3"></div> <div class="col-6 col-md-3"></div>
<div class="col-6 col-md-4"> <div class="col-6 col-md-4">
<div *ngIf="( fieldTitle == 'Edit Order' && setData.status == 'ordered') || dropdown_data == 'ordered'"> <div *ngIf="(fieldTitle == 'Edit Order' && dropdown_data == 'ordered') || (dropdown_data == null && fieldTitle != 'View Order')">
<label for="subject" style="font-weight: 600; text-align: center; display: block;">Add or Remove Products </label> <label for="subject" style="font-weight: 600; text-align: center; display: block;">Add or Remove Products </label>
</div> </div>
</div> </div>
<nb-action icon="plus-circle-outline" class="custom-action-icon" [nbTooltip]="'Add'" (click)="addInputFieldGroup()" *ngIf="inputFieldGroups.length == 0"></nb-action> <nb-action icon="plus-circle-outline" class="custom-action-icon" [nbTooltip]="'Add'" (click)="addInputFieldGroup()" *ngIf="inputFieldGroups.length == 0"></nb-action>
</div> </div>
@ -192,7 +192,7 @@
<div class="col-6 col-md-3"> <div class="col-6 col-md-3">
<div > <div >
<nb-actions size="medium" *ngIf="(fieldTitle != 'View Order') && ( fieldTitle == 'Edit Order' && setData.status == 'ordered') || dropdown_data == 'ordered'"> <nb-actions size="medium" *ngIf="(fieldTitle == 'Edit Order' && dropdown_data == 'ordered') || (dropdown_data == null && fieldTitle != 'View Order')">
<nb-action icon="plus-circle-outline" class="custom-action-icon" [nbTooltip]="'Add'" (click)="addInputFieldGroup()"></nb-action> <nb-action icon="plus-circle-outline" class="custom-action-icon" [nbTooltip]="'Add'" (click)="addInputFieldGroup()"></nb-action>
<nb-action icon="minus-circle-outline" [nbTooltip]="'Remove'" (click)="removeInputFieldGroup(i)"></nb-action> <nb-action icon="minus-circle-outline" [nbTooltip]="'Remove'" (click)="removeInputFieldGroup(i)"></nb-action>

View File

@ -57,7 +57,7 @@ fieldTitle:any ='New Order'
selectCustomerData :any =[];selectStatus:any =[];CancelReason:any =[];selectDriver:any =[];drivers:any =[]; selectCustomerData :any =[];selectStatus:any =[];CancelReason:any =[];selectDriver:any =[];drivers:any =[];
invoice = new Invoice(); invoice = new Invoice();
hiddenBtn= false; hiddenBtn= false;
dropdown_data: any; dropdown_data: any = null;
delArr:any=[] delArr:any=[]
selectedProductId: number | undefined = null; selectedProductId: number | undefined = null;
addFormBtn: any; addFormBtn: any;
@ -70,6 +70,7 @@ fieldTitle:any ='New Order'
if(res){ if(res){
this.addFormBtn = 1 this.addFormBtn = 1
this. setData = res this. setData = res
this.dropdown_data = this.setData['OrderDetails.status'];
console.log(this.setData) console.log(this.setData)
this.selectStatus = res.status this.selectStatus = res.status
console.log(this.selectStatus) console.log(this.selectStatus)

View File

@ -9,8 +9,8 @@
// The list of which env maps to which file can be found in `.angular-cli.json`. // The list of which env maps to which file can be found in `.angular-cli.json`.
export const environment = { export const environment = {
// apiEndpoint:'https://dev.venbait.in/vnms/api/', apiEndpoint:'https://dev.venbait.in/vnms/api/',
apiEndpoint:'http://localhost:8081/api/', // apiEndpoint:'http://localhost:8081/api/',
mailUrl:'', mailUrl:'',
production: false, production: false,
}; };

BIN
vnms_fe_build.zip Normal file

Binary file not shown.