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

Fix: Reports were not working as they were not adapted to the new Enums

Browse Source 
Fix: The docker image borked on printing as it did not have the en_IN locale
Fix: Angular errored as it needed typescript < 4.1.0
Fix: chd yml had a typo in host name
This commit is contained in:
Amritanshu Agrawal 2020-12-15 22:15:51 +05:30
parent 5a73387404
commit 22de4f7624
7 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
barker/barker/routers/reports/beer_consumption_report.py
View File

@ -59,9 +59,9 @@ def beer_consumption(
),
Voucher.voucher_type.in_(
[
VoucherType.REGULAR_BILL.value,
VoucherType.NO_CHARGE.value,
VoucherType.STAFF.value,
VoucherType.REGULAR_BILL,
VoucherType.NO_CHARGE,
VoucherType.STAFF,
]
),
)

2
barker/barker/routers/reports/discount_report.py
View File

@ -73,7 +73,7 @@ def get_discount_report(s: date, f: date, db: Session) -> List[DiscountReportIte
ProductVersion.valid_till == None, # noqa: E711
ProductVersion.valid_till >= day,
),
Voucher.voucher_type.in_([VoucherType.REGULAR_BILL.value, VoucherType.KOT.value]),
Voucher.voucher_type.in_([VoucherType.REGULAR_BILL, VoucherType.KOT]),
)
.group_by(SaleCategory.name)
.order_by(SaleCategory.name)

2
barker/barker/routers/reports/sale_report.py
View File

@ -72,7 +72,7 @@ def get_sale(s: date, f: date, db: Session) -> List[SaleReportItem]:
.filter(
Voucher.date >= start_date,
Voucher.date <= finish_date,
Voucher.voucher_type == VoucherType.REGULAR_BILL.value,
Voucher.voucher_type == VoucherType.REGULAR_BILL,
or_(
ProductVersion.valid_from == None, # noqa: E711
ProductVersion.valid_from <= day,

2
barker/barker/routers/reports/tax_report.py
View File

@ -64,7 +64,7 @@ def get_tax(s: date, f: date, db: Session) -> List[TaxReportItem]:
.filter(
Voucher.date >= start_date,
Voucher.date <= finish_date,
Voucher.voucher_type == VoucherType.REGULAR_BILL.value,
Voucher.voucher_type == VoucherType.REGULAR_BILL,
)
.group_by(Tax.name, Inventory.tax_rate)
.order_by(Tax.name, Inventory.tax_rate)

2
bookie/package.json
View File

@ -64,7 +64,7 @@
"prettier": "^2.2.1",
"standard-version": "^9.0.0",
"ts-node": "^9.1.1",
"typescript": "^4.1.3"
"typescript": "~4.0.5"
},
"husky": {
"hooks": {

9
docker/app/Dockerfile
View File

@ -7,6 +7,15 @@ RUN npm install --unsafe-perm --legacy-peer-deps && /app/bookie/node_modules/.bi
FROM python:latest
LABEL maintainer="Amritanshu <docker@tanshu.com>"
RUN apt-get update && \
apt-get install -y locales && \
sed --in-place --expression='s/# en_IN UTF-8/en_IN UTF-8/' /etc/locale.gen && \
dpkg-reconfigure --frontend=noninteractive locales
ENV LANG en_IN
ENV LC_ALL en_IN
COPY --from=builder /app/barker /app
COPY --from=builder /app/frontend /app/frontend
WORKDIR /app

2
docker/vars/chd.yml
View File

@ -1,5 +1,5 @@
---
http_host: "knox.greatbear.id"
http_host: "knox.greatbear.in"
http_conf: "knox.greatbear.in.conf"
host_port: "8337"
host_directory: "barker-chd"