mirror of
https://github.com/Nezumi-2711/foodify-frontend.git
synced 2026-09-22 13:38:44 +00:00
Fix bug 24.4
This commit is contained in:
@@ -43,9 +43,9 @@
|
|||||||
</ngb-pagination>
|
</ngb-pagination>
|
||||||
<select class="form-select" style="width: auto" name="pageSize"
|
<select class="form-select" style="width: auto" name="pageSize"
|
||||||
(change)="getProductByCategories()" [(ngModel)]="thePageSize">
|
(change)="getProductByCategories()" [(ngModel)]="thePageSize">
|
||||||
<option [value]="10" [selected]="true" [ngValue]="10">10 items per page</option>
|
<option [value]="10" [selected]="true" [ngValue]="10">10 sản phẩm / trang</option>
|
||||||
<option [ngValue]="15">15 items per page</option>
|
<option [ngValue]="15">15 sản phẩm / trang</option>
|
||||||
<option [ngValue]="20">20 items per page</option>
|
<option [ngValue]="20">20 sản phẩm / trang</option>
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -26,8 +26,7 @@
|
|||||||
<td>{{ order?.orderTime }}</td>
|
<td>{{ order?.orderTime }}</td>
|
||||||
<td>{{ order?.user.fullName }}</td>
|
<td>{{ order?.user.fullName }}</td>
|
||||||
<td *ngIf="order?.shipper?.user?.fullName">{{ order?.shipper?.user?.fullName }}</td>
|
<td *ngIf="order?.shipper?.user?.fullName">{{ order?.shipper?.user?.fullName }}</td>
|
||||||
<td *ngIf="order?.shipper?.user?.fullName == null"><i style="color: lightseagreen;"
|
<td *ngIf="order?.shipper?.user?.fullName == null"><i style="color: #FF8084;" class="fa fa-times"></i>
|
||||||
class="fa fa-spinner fa-pulse fa-3x fa-fw"></i>
|
|
||||||
<span class="sr-only">Loading...</span>
|
<span class="sr-only">Loading...</span>
|
||||||
</td>
|
</td>
|
||||||
<td>{{ order?.address }}</td>
|
<td>{{ order?.address }}</td>
|
||||||
|
|||||||
@@ -32,8 +32,7 @@
|
|||||||
<td>{{ order.orderTime }}</td>
|
<td>{{ order.orderTime }}</td>
|
||||||
<td>{{ order.user.fullName }}</td>
|
<td>{{ order.user.fullName }}</td>
|
||||||
<td *ngIf="order?.shipper?.user?.fullName != null">{{ order?.shipper?.user?.fullName }}</td>
|
<td *ngIf="order?.shipper?.user?.fullName != null">{{ order?.shipper?.user?.fullName }}</td>
|
||||||
<td *ngIf="order?.shipper?.user?.fullName == null"><i style="color: lightseagreen;"
|
<td *ngIf="order?.shipper?.user?.fullName == null"><i style="color: #FF8084;" class="fa fa-times"></i>
|
||||||
class="fa fa-spinner fa-pulse fa-3x fa-fw"></i>
|
|
||||||
<span class="sr-only">Loading...</span>
|
<span class="sr-only">Loading...</span>
|
||||||
</td>
|
</td>
|
||||||
<td>{{ order.address }}</td>
|
<td>{{ order.address }}</td>
|
||||||
|
|||||||
Reference in New Issue
Block a user