tanshu/barker
1
0
Fork 0
Code Issues 1 Pull Requests Releases 4 Activity

Display units in Sale / Product and don't show brackets when no units entered

Browse Source
This commit is contained in:
Amritanshu
2019-08-21 14:13:53 +05:30
parent b898e26dc6
commit fd1111f378
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
barker/models/master.py
View File

@ -187,7 +187,7 @@ class Product(Base):
@hybrid_property @hybrid_property
def full_name(self): def full_name(self):
return "{0} ({1})".format(self.name, self.units) return f"{self.name} ({self.units})" if self.units else self.name
@full_name.expression @full_name.expression
def full_name(cls): def full_name(cls):

3
barker/views/product.py
View File

@ -195,8 +195,7 @@ def show_list_sale(request):
products.append( products.append(
{ {
"id": item.id, "id": item.id,
"name": item.name, "name": item.full_name,
"units": item.units,
"saleCategory": { "saleCategory": {
"id": item.sale_category_id, "id": item.sale_category_id,
"name": item.sale_category.name, "name": item.sale_category.name,

1
bookie/src/app/sales/products/products.component.html
View File

@ -3,6 +3,7 @@
<mat-card fxLayout="column" class="square-button" matRipple *ngFor="let item of list" (click)="addProduct(item)" <mat-card fxLayout="column" class="square-button" matRipple *ngFor="let item of list" (click)="addProduct(item)"
[class.yellow300]="item.hasHappyHour" [class.grey800]="item.isNotAvailable"> [class.yellow300]="item.hasHappyHour" [class.grey800]="item.isNotAvailable">
<h3 class="item-name">{{item.name}}</h3> <h3 class="item-name">{{item.name}}</h3>
<mat-card-subtitle class="center">{{item.price | currency:'INR'}}</mat-card-subtitle>
</mat-card> </mat-card>
<mat-card fxLayout="column" class="square-button red700" matRipple [routerLink]="['../../menu-categories']" <mat-card fxLayout="column" class="square-button red700" matRipple [routerLink]="['../../menu-categories']"
queryParamsHandling="preserve"> queryParamsHandling="preserve">