Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2dfbfd8fcb | ||
|
|
221fadfdfc |
@@ -1 +1 @@
|
||||
__version__ = "15.1.5"
|
||||
__version__ = "15.1.6"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[project]
|
||||
name = "barker"
|
||||
version = "15.1.5"
|
||||
version = "15.1.6"
|
||||
description = "Point of Sale for a restaurant"
|
||||
requires-python = ">=3.14"
|
||||
authors = [{ name = "tanshu", email = "git@tanshu.com" }]
|
||||
|
||||
Generated
+1
-1
@@ -231,7 +231,7 @@ wheels = [
|
||||
|
||||
[[package]]
|
||||
name = "barker"
|
||||
version = "15.1.5"
|
||||
version = "15.1.6"
|
||||
source = { editable = "." }
|
||||
dependencies = [
|
||||
{ name = "aiohttp" },
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "bookie",
|
||||
"version": "15.1.5",
|
||||
"version": "15.1.6",
|
||||
"scripts": {
|
||||
"ng": "ng",
|
||||
"start": "ng serve",
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
export const environment = {
|
||||
production: true,
|
||||
ACCESS_TOKEN_REFRESH_MINUTES: 10, // refresh token 10 minutes before expiry
|
||||
version: '15.1.5',
|
||||
version: '15.1.6',
|
||||
};
|
||||
|
||||
export const dateFormat = {
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
</mat-card>
|
||||
</div>
|
||||
</mat-dialog-content>
|
||||
<mat-dialog-actions align="end">
|
||||
<mat-dialog-actions>
|
||||
<button mat-button [mat-dialog-close]="false">Cancel</button>
|
||||
<button mat-button [mat-dialog-close]="selectedVal">Done</button>
|
||||
</mat-dialog-actions>
|
||||
|
||||
@@ -27,22 +27,22 @@
|
||||
<div class="row-container">
|
||||
<mat-form-field class="flex-auto">
|
||||
<mat-label>Name</mat-label>
|
||||
<input matInput [value]="formModel().name" readonly />
|
||||
<input matInput [formField]="form.name" />
|
||||
</mat-form-field>
|
||||
</div>
|
||||
<div class="row-container">
|
||||
<mat-form-field class="flex-auto">
|
||||
<mat-label>Address</mat-label>
|
||||
<textarea matInput [value]="formModel().address" readonly> </textarea>
|
||||
<textarea matInput [formField]="form.address"> </textarea>
|
||||
</mat-form-field>
|
||||
</div>
|
||||
<div class="row-container">
|
||||
<mat-checkbox [checked]="formModel().printInBill" [disabled]="true">Print in Bill?</mat-checkbox>
|
||||
<mat-checkbox [formField]="form.printInBill">Print in Bill?</mat-checkbox>
|
||||
</div>
|
||||
<p></p>
|
||||
<div class="discounts">
|
||||
<ul>
|
||||
@for (r of formModel().discounts; track r.id) {
|
||||
@for (r of form().value().discounts; track r.id) {
|
||||
@if (r.discount > 0) {
|
||||
<li>{{ r.name }} - {{ r.discount | percent: '1.2-2' }}</li>
|
||||
}
|
||||
@@ -51,7 +51,7 @@
|
||||
</div>
|
||||
</form>
|
||||
</mat-dialog-content>
|
||||
<mat-dialog-actions align="end">
|
||||
<mat-dialog-actions>
|
||||
<button mat-button [mat-dialog-close]="false">Cancel</button>
|
||||
<button type="button" mat-raised-button color="primary" (click)="save()">Select</button>
|
||||
</mat-dialog-actions>
|
||||
|
||||
@@ -79,6 +79,7 @@ export class ChooseCustomerComponent {
|
||||
|
||||
save() {
|
||||
const customer = this.getItem();
|
||||
console.log(customer);
|
||||
const promise = this.ser.saveOrUpdate(customer);
|
||||
promise.subscribe((x) => this.dialogRef.close(x));
|
||||
}
|
||||
@@ -96,15 +97,15 @@ export class ChooseCustomerComponent {
|
||||
}
|
||||
|
||||
getItem(): Customer {
|
||||
const formModel = this.formModel();
|
||||
const formValue = this.form().value();
|
||||
|
||||
return new Customer({
|
||||
id: formModel.id,
|
||||
name: formModel.name ?? '',
|
||||
phone: formModel.phone ?? '',
|
||||
address: formModel.address ?? '',
|
||||
printInBill: formModel.printInBill ?? false,
|
||||
discounts: formModel.discounts.map((item) => ({ ...item })),
|
||||
id: formValue.id,
|
||||
name: formValue.name ?? '',
|
||||
phone: formValue.phone ?? '',
|
||||
address: formValue.address ?? '',
|
||||
printInBill: formValue.printInBill ?? false,
|
||||
discounts: formValue.discounts.map((item) => ({ ...item })),
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
<input matInput type="number" [formField]="form.discounts[i].discount" autocomplete="off" />
|
||||
<span matTextSuffix>%</span>
|
||||
<mat-hint>Cust: {{ row.customer | percent: '1.2-2' }}</mat-hint>
|
||||
<mat-hint align="end">Max: {{ row.limit | percent: '1.2-2' }}</mat-hint>
|
||||
<mat-hint>Max: {{ row.limit | percent: '1.2-2' }}</mat-hint>
|
||||
</mat-form-field>
|
||||
</mat-cell>
|
||||
</ng-container>
|
||||
@@ -26,7 +26,7 @@
|
||||
</mat-table>
|
||||
</form>
|
||||
</mat-dialog-content>
|
||||
<mat-dialog-actions align="end">
|
||||
<mat-dialog-actions>
|
||||
<button mat-button [mat-dialog-close]="false">Cancel</button>
|
||||
<button type="button" mat-button (click)="accept()" color="primary">Ok</button>
|
||||
</mat-dialog-actions>
|
||||
|
||||
@@ -30,6 +30,6 @@
|
||||
}
|
||||
</mat-tab-group>
|
||||
</mat-dialog-content>
|
||||
<mat-dialog-actions align="end">
|
||||
<mat-dialog-actions>
|
||||
<button mat-button [mat-dialog-close]="selected()">Done</button>
|
||||
</mat-dialog-actions>
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
</mat-table>
|
||||
</form>
|
||||
</mat-dialog-content>
|
||||
<mat-dialog-actions align="end">
|
||||
<mat-dialog-actions>
|
||||
<button mat-button [mat-dialog-close]="false">Cancel</button>
|
||||
<button type="button" mat-button (click)="accept()" color="primary" [disabled]="!selected">Ok</button>
|
||||
</mat-dialog-actions>
|
||||
|
||||
@@ -48,7 +48,7 @@
|
||||
</mat-form-field>
|
||||
</form>
|
||||
</mat-dialog-content>
|
||||
<mat-dialog-actions align="end">
|
||||
<mat-dialog-actions>
|
||||
<button mat-button [mat-dialog-close]>Cancel</button>
|
||||
<button type="button" mat-button (click)="accept()" color="primary" [disabled]="!!balance()">Ok</button>
|
||||
</mat-dialog-actions>
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
</div>
|
||||
</form>
|
||||
</mat-dialog-content>
|
||||
<mat-dialog-actions align="end">
|
||||
<mat-dialog-actions>
|
||||
<button mat-button [mat-dialog-close]="false">Cancel</button>
|
||||
<button type="button" mat-button (click)="accept()" color="primary">Ok</button>
|
||||
</mat-dialog-actions>
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
}
|
||||
</div>
|
||||
</mat-dialog-content>
|
||||
<mat-dialog-actions align="end">
|
||||
<mat-dialog-actions>
|
||||
<button mat-button [mat-dialog-close]="false">Cancel</button>
|
||||
<button type="button" mat-button (click)="accept()" color="primary">Ok</button>
|
||||
</mat-dialog-actions>
|
||||
|
||||
Reference in New Issue
Block a user