diff --git a/admin/src/components/Tables/OpenCreationsTable.spec.js b/admin/src/components/Tables/OpenCreationsTable.spec.js
index 2b41a9b96..2eb149e4f 100644
--- a/admin/src/components/Tables/OpenCreationsTable.spec.js
+++ b/admin/src/components/Tables/OpenCreationsTable.spec.js
@@ -28,7 +28,7 @@ const propsData = {
amount: 210,
memo: 'Aktives Grundeinkommen für Januar 2022',
date: '2022-01-01T00:00:00.000Z',
- moderator: 1,
+ moderator: null,
creation: [790, 1000, 1000],
__typename: 'PendingCreation',
},
@@ -66,7 +66,7 @@ const propsData = {
},
},
{ key: 'moderator', label: 'moderator' },
- { key: 'edit_creation', label: 'edit' },
+ { key: 'editCreation', label: 'edit' },
{ key: 'confirm', label: 'save' },
],
toggleDetails: false,
@@ -113,6 +113,10 @@ describe('OpenCreationsTable', () => {
expect(wrapper.findAll('tr').at(1).find('.bi-pencil-square').exists()).toBe(true)
})
+ it('has no button.bi-pencil-square for user contribution ', () => {
+ expect(wrapper.findAll('tr').at(2).find('.bi-pencil-square').exists()).toBe(false)
+ })
+
describe('show edit details', () => {
beforeEach(async () => {
await wrapper.findAll('tr').at(1).find('.bi-pencil-square').trigger('click')
diff --git a/admin/src/components/Tables/OpenCreationsTable.vue b/admin/src/components/Tables/OpenCreationsTable.vue
index 1e61f00b0..3ebc81fba 100644
--- a/admin/src/components/Tables/OpenCreationsTable.vue
+++ b/admin/src/components/Tables/OpenCreationsTable.vue
@@ -11,8 +11,14 @@
-
-
+
+
diff --git a/admin/src/pages/CreationConfirm.spec.js b/admin/src/pages/CreationConfirm.spec.js
index d0293fb3f..352eba809 100644
--- a/admin/src/pages/CreationConfirm.spec.js
+++ b/admin/src/pages/CreationConfirm.spec.js
@@ -18,7 +18,7 @@ const apolloQueryMock = jest.fn().mockResolvedValue({
amount: 500,
memo: 'Danke für alles',
date: new Date(),
- moderator: 0,
+ moderator: 2,
},
{
id: 2,
@@ -28,7 +28,7 @@ const apolloQueryMock = jest.fn().mockResolvedValue({
amount: 1000000,
memo: 'Gut Ergattert',
date: new Date(),
- moderator: 0,
+ moderator: 2,
},
],
},
diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index e78499c4b..c07e6b351 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -117,7 +117,7 @@ export default {
},
},
{ key: 'moderator', label: this.$t('moderator') },
- { key: 'edit_creation', label: this.$t('edit') },
+ { key: 'editCreation', label: this.$t('edit') },
{ key: 'confirm', label: this.$t('save') },
]
},
diff --git a/backend/src/seeds/factory/creation.ts b/backend/src/seeds/factory/creation.ts
index 75a765fae..d3f0f78ca 100644
--- a/backend/src/seeds/factory/creation.ts
+++ b/backend/src/seeds/factory/creation.ts
@@ -35,12 +35,17 @@ export const creationFactory = async (
if (creation.confirmed) {
await mutate({ mutation: confirmContribution, variables: { id: pendingCreation.id } })
+ const confirmedCreation = await Contribution.findOneOrFail({ id: pendingCreation.id })
+
if (creation.moveCreationDate) {
const transaction = await Transaction.findOneOrFail({
where: { userId: user.id, creationDate: new Date(creation.creationDate) },
order: { balanceDate: 'DESC' },
})
if (transaction.decay.equals(0) && transaction.creationDate) {
+ confirmedCreation.contributionDate = new Date(
+ nMonthsBefore(transaction.creationDate, creation.moveCreationDate),
+ )
transaction.creationDate = new Date(
nMonthsBefore(transaction.creationDate, creation.moveCreationDate),
)
@@ -48,6 +53,7 @@ export const creationFactory = async (
nMonthsBefore(transaction.balanceDate, creation.moveCreationDate),
)
await transaction.save()
+ await confirmedCreation.save()
}
}
} else {
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index 9d3e0b8d4..2af3c41ee 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -94,9 +94,7 @@ services:
#########################################################
## NGINX ################################################
#########################################################
- nginx:
- volumes:
- - ./logs/nginx:/var/log/nginx
+ # nginx:
#########################################################
## PHPMYADMIN ###########################################
diff --git a/docker-compose.yml b/docker-compose.yml
index 6c0dffe15..5f0ab4dde 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -107,6 +107,9 @@ services:
# Application only envs
#env_file:
# - ./frontend/.env
+ volumes:
+ # : – mirror bidirectional path in local context with path in Docker container
+ - ./logs/backend:/logs/backend
########################################################
# DATABASE #############################################
@@ -149,6 +152,8 @@ services:
- admin
ports:
- 80:80
+ volumes:
+ - ./logs/nginx:/var/log/nginx
networks:
external-net: