eigen
/
pos-be
12
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 295 Wiki Activity

Merge branch 'development' of ssh://git.eigen.co.id:2222/eigen/pos-be into feat/adjustment-report
continuous-integration/drone/push Build is passing Details

pull/92/head
Firman Ramdhani 2024-09-18 16:25:39 +07:00
parent f4cf5178b8 f7c49d27d5
commit c76594d767
4 changed files with 60 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@ -2,8 +2,8 @@ FROM node:18.17-alpine as builder
RUN apk add --no-cache git RUN apk add --no-cache git
WORKDIR /app WORKDIR /app
COPY . . COPY . .
RUN npm install RUN yarn install
RUN npm run build RUN yarn build
FROM node:18.17-alpine FROM node:18.17-alpine
ARG env_target ARG env_target
WORKDIR /app WORKDIR /app

20
src/modules/reports/shared/configs/transaction-report/configs/income-per-item-master.ts
View File

@ -127,6 +127,13 @@ export default <ReportConfigEntity>{
type: DATA_TYPE.MEASURE, type: DATA_TYPE.MEASURE,
format: DATA_FORMAT.CURRENCY, format: DATA_FORMAT.CURRENCY,
}, },
{
column: 'tr_item__total_price',
query: 'tr_item.total_price',
label: 'Total Penjualan',
type: DATA_TYPE.MEASURE,
format: DATA_FORMAT.CURRENCY,
},
{ {
column: 'tr_item_bundling__payment_total_dpp', column: 'tr_item_bundling__payment_total_dpp',
query: 'tr_item_bundling.payment_total_dpp', query: 'tr_item_bundling.payment_total_dpp',
@ -142,9 +149,16 @@ export default <ReportConfigEntity>{
format: DATA_FORMAT.CURRENCY, format: DATA_FORMAT.CURRENCY,
}, },
{ {
column: 'tr_item__total_price', column: 'tr_item_bundling__total_profit_share',
query: 'tr_item.total_price', query: 'tr_item_bundling.total_profit_share',
label: 'Total Penjualan', label: 'Profit Share',
type: DATA_TYPE.MEASURE,
format: DATA_FORMAT.CURRENCY,
},
{
column: 'tr_item_bundling__total_share_tenant',
query: 'tr_item_bundling.total_share_tenant',
label: 'Tenant Share',
type: DATA_TYPE.MEASURE, type: DATA_TYPE.MEASURE,
format: DATA_FORMAT.CURRENCY, format: DATA_FORMAT.CURRENCY,
}, },

20
src/modules/reports/shared/configs/transaction-report/configs/income-per-item.ts
View File

@ -112,6 +112,13 @@ export default <ReportConfigEntity>{
type: DATA_TYPE.MEASURE, type: DATA_TYPE.MEASURE,
format: DATA_FORMAT.CURRENCY, format: DATA_FORMAT.CURRENCY,
}, },
{
column: 'tr_item__total_price',
query: 'tr_item.total_price',
label: 'Total Penjualan',
type: DATA_TYPE.MEASURE,
format: DATA_FORMAT.CURRENCY,
},
{ {
column: 'tr_item__payment_total_dpp', column: 'tr_item__payment_total_dpp',
query: 'tr_item.payment_total_dpp', query: 'tr_item.payment_total_dpp',
@ -127,9 +134,16 @@ export default <ReportConfigEntity>{
format: DATA_FORMAT.CURRENCY, format: DATA_FORMAT.CURRENCY,
}, },
{ {
column: 'tr_item__total_price', column: 'tr_item__total_profit_share',
query: 'tr_item.total_price', query: 'tr_item.total_profit_share',
label: 'Total Penjualan', label: 'Profit Share',
type: DATA_TYPE.MEASURE,
format: DATA_FORMAT.CURRENCY,
},
{
column: 'tr_item__total_share_tenant',
query: 'tr_item.total_share_tenant',
label: 'Tenant Share',
type: DATA_TYPE.MEASURE, type: DATA_TYPE.MEASURE,
format: DATA_FORMAT.CURRENCY, format: DATA_FORMAT.CURRENCY,
}, },

34
src/modules/reports/shared/configs/transaction-report/configs/income.ts
View File

@ -102,16 +102,9 @@ export default <ReportConfigEntity>{
format: DATA_FORMAT.CURRENCY, format: DATA_FORMAT.CURRENCY,
}, },
{ {
column: 'main__payment_total_dpp', column: 'main__payment_sub_total',
query: 'main.payment_total_dpp', query: 'main.payment_sub_total',
label: 'DPP', label: 'Subtotal',
type: DATA_TYPE.MEASURE,
format: DATA_FORMAT.CURRENCY,
},
{
column: 'main__payment_total_tax',
query: 'main.payment_total_tax',
label: 'Total Pajak',
type: DATA_TYPE.MEASURE, type: DATA_TYPE.MEASURE,
format: DATA_FORMAT.CURRENCY, format: DATA_FORMAT.CURRENCY,
}, },
@ -136,6 +129,27 @@ export default <ReportConfigEntity>{
type: DATA_TYPE.MEASURE, type: DATA_TYPE.MEASURE,
format: DATA_FORMAT.CURRENCY, format: DATA_FORMAT.CURRENCY,
}, },
{
column: 'main__payment_total_dpp',
query: 'main.payment_total_dpp',
label: 'DPP',
type: DATA_TYPE.MEASURE,
format: DATA_FORMAT.CURRENCY,
},
{
column: 'main__payment_total_tax',
query: 'main.payment_total_tax',
label: 'Total Pajak',
type: DATA_TYPE.MEASURE,
format: DATA_FORMAT.CURRENCY,
},
{
column: 'main__payment_total_share',
query: 'main.payment_total_share',
label: 'Profit Share',
type: DATA_TYPE.MEASURE,
format: DATA_FORMAT.CURRENCY,
},
{ {
column: 'refund__refund_date', column: 'refund__refund_date',
query: 'refund.refund_date', query: 'refund.refund_date',