VNMS/vnms_admin_fe
VNMS/vnms_admin_fe
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

status issue fix

Browse Source
This commit is contained in:
Venba 2024-02-05 11:07:09 +05:30
parent fba470b826
commit 3008a7d4f8
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
VNMS_Production_Build(05-02-2024).zip Normal file
View File

Binary file not shown.

13
src/app/pages/order/order-form/order-form.component.html
View File

@ -12,7 +12,7 @@
<nb-icon icon="corner-down-left-outline"></nb-icon>
</button>
<button nbTooltip="Edit" nbTooltipPlacement="top" *ngIf=" fieldTitle != 'Edit Order' && this.selectStatus != 'Delivered' && addFormBtn != 0" style=" margin-left: 2rem;" (click)="edit()" nbButton status="primary" hero>
<button nbTooltip="Edit" nbTooltipPlacement="top" *ngIf=" fieldTitle != 'Edit Order' && this.selectStatus != 'Delivered' && this.selectStatus != 'Cancelled' && addFormBtn != 0" style=" margin-left: 2rem;" (click)="edit()" nbButton status="primary" hero>
<nb-icon icon="edit-outline"></nb-icon>
</button>
@ -79,12 +79,11 @@
<p style="text-transform: capitalize;" *ngIf="fieldTitle == 'View Order' " [ngStyle] = "{'color':setData.status =='ordered'?'#1f1dc9f5':setData.status =='Delivered' ?'green':'red' }" > {{setData.status}} <br> <span *ngIf="setData.status == 'Delivered' || setData.status == 'Out For Delivery'" style="color: black;">({{setData['UserDetails.userName']}}) </span></p>
<nb-select selected="" *ngIf="fieldTitle != 'View Order'" (ngModelChange)="onSelectChange($event)" placeholder="Change Status" clearable style="width: 57% !important;margin-top: 1rem;" [(ngModel)]="selectStatus" >
<!-- <nb-option value="">Change Status</nb-option> -->
<nb-option *ngIf="setData.status == 'ordered'" value="ordered">Ordered</nb-option>
<nb-option value="In Progress">In Progresss</nb-option>
<nb-option value="Out For Delivery">Out For Delivery</nb-option>
<nb-option value="Delivered">Delivered</nb-option>
<nb-option value="Cancelled">Cancelled</nb-option>
<nb-option *ngIf="setData.status == 'ordered' || (setData.status != 'In Progress' && setData.status != 'Out For Delivery')" value="ordered">Ordered</nb-option>
<nb-option *ngIf="setData.status != 'Out For Delivery'" value="In Progress">In Progresss</nb-option>
<nb-option value="Out For Delivery">Out For Delivery</nb-option>
<!-- <nb-option *ngIf="setData.status != 'ordered' || setData.status != 'In Progress'" value="Delivered">Delivered</nb-option> -->
<nb-option value="Cancelled">Cancelled</nb-option>
</nb-select>

2
src/environments/environment.prod.ts
View File

@ -4,7 +4,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*/
export const environment = {
apiEndpoint:'https://dev.venbait.in/vnms/api/',
apiEndpoint:'https://api.vnms.in/api/',
mailUrl:'',
production: true,
};