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

Fix: Kots should be sorted by date as a relationship of the voucher. This was causing them to appear in random order in sales.

Browse Source
This commit is contained in:
Amritanshu Agrawal 2021-06-22 05:34:02 +05:30
parent 1c222872d2
commit 567fb836b3
4 changed files with 22 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
barker/barker/models/voucher.py
View File

@ -13,6 +13,7 @@ from sqlalchemy import (
from sqlalchemy.dialects.postgresql import UUID
from sqlalchemy.orm import relationship
from .kot import Kot
from .meta import Base
from .voucher_type import VoucherType
@ -51,6 +52,7 @@ class Voucher(Base):
backref="voucher",
cascade="delete, delete-orphan",
cascade_backrefs=False,
order_by=Kot.date,
)
settlements = relationship(
"Settlement",

12
deploy.sh
View File

@ -5,17 +5,7 @@ cd "$parent_path" || exit
./lint.sh
if [ 1 -eq "$#" ]
then
./version_bump.sh "$1"
else
echo "No version bump"
git push
git tag --delete latest
git tag latest
git push --delete origin latest
git push --tags
fi
./version_bump.sh "$1"
cd "$parent_path/docker/app" || exit
docker build --tag barker:latest .

2
docker/app/Dockerfile
View File

@ -2,7 +2,7 @@ FROM node:latest AS builder
ADD https://git.tanshu.com/api/v1/repos/tanshu/barker/tags /tags.json
RUN git clone --single-branch --depth 1 --branch latest https://git.tanshu.com/tanshu/barker.git /app
WORKDIR /app/bookie
RUN npm install --unsafe-perm && /app/bookie/node_modules/.bin/ng build --prod
RUN npm install --unsafe-perm && /app/bookie/node_modules/.bin/ng build
FROM python:latest

35
version_bump.sh
View File

@ -2,27 +2,28 @@
parent_path=$( cd "$(dirname "${BASH_SOURCE[0]}")" || exit ; pwd -P )
cd "$parent_path" || exit
if [ 1 -ne "$#" ]
if [ 1 -eq "$#" ]
then
echo "Usage: `basename $0` Version: eg. 9.0.0"
exit 0
echo "Version bump to $1"
sed --in-place --regexp-extended 's/"([0-9].[0-9].[0-9])"/"'"$1"'"/g' barker/barker/__version__.py
git add barker/barker/__version__.py
sed --in-place --regexp-extended 's/version = "([0-9].[0-9].[0-9])"/version = "'"$1"'"/g' barker/pyproject.toml
git add barker/pyproject.toml
sed --in-place --regexp-extended 's/version = "([0-9].[0-9].[0-9])"/version = "'"$1"'"/g' frank/pyproject.toml
git add frank/pyproject.toml
sed --in-place --regexp-extended 's/version: '\''([0-9].[0-9].[0-9])'\''/version: '\'"$1"\''/g' bookie/src/environments/environment.prod.ts
git add bookie/src/environments/environment.prod.ts
sed --in-place --regexp-extended 's/version: '\''([0-9].[0-9].[0-9])'\''/version: '\'"$1"\''/g' bookie/src/environments/environment.ts
git add bookie/src/environments/environment.ts
sed --in-place --regexp-extended 's/"version": "([0-9].[0-9].[0-9])"/"version": "'"$1"'"/g' bookie/package.json
git add bookie/package.json
git commit -m "Version Bump v$1"
git tag "v$1"
else
echo "No version bump"
fi
sed --in-place --regexp-extended 's/"([0-9].[0-9].[0-9])"/"'"$1"'"/g' barker/barker/__version__.py
git add barker/barker/__version__.py
sed --in-place --regexp-extended 's/version = "([0-9].[0-9].[0-9])"/version = "'"$1"'"/g' barker/pyproject.toml
git add barker/pyproject.toml
sed --in-place --regexp-extended 's/version = "([0-9].[0-9].[0-9])"/version = "'"$1"'"/g' frank/pyproject.toml
git add frank/pyproject.toml
sed --in-place --regexp-extended 's/version: '\''([0-9].[0-9].[0-9])'\''/version: '\'"$1"\''/g' bookie/src/environments/environment.prod.ts
git add bookie/src/environments/environment.prod.ts
sed --in-place --regexp-extended 's/version: '\''([0-9].[0-9].[0-9])'\''/version: '\'"$1"\''/g' bookie/src/environments/environment.ts
git add bookie/src/environments/environment.ts
sed --in-place --regexp-extended 's/"version": "([0-9].[0-9].[0-9])"/"version": "'"$1"'"/g' bookie/package.json
git add bookie/package.json
git commit -m "Version Bump v$1"
git push
git tag --delete latest
git tag latest
git tag "v$1"
git push --delete origin latest
git push --tags