verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 63 Releases Wiki Activity

refs: #084200 mod del footer y readapatacion heade #1382

Merged
carlossa merged 30 commits from 084200-footerAlbaranReport into dev 2023-04-26 08:54:13 +00:00
Conversation 1 Commits 30 Files Changed 17 +56 -41
carlossa commented 2023-03-09 13:03:30 +00:00
Member
Copy Link
No description provided.
carlossa added 1 commit 2023-03-09 13:03:30 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
b1c8f51e35 refs: #084200 mod del footer y readapatacion heade
carlossa added 1 commit 2023-03-09 13:03:40 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
73ca811fc0 Merge branch 'dev' into 084200-footerAlbaranReport
carlossa requested review from jgallego 2023-03-09 13:03:55 +00:00
carlossa requested review from joan 2023-03-09 13:04:05 +00:00
carlossa added 2 commits 2023-03-09 14:07:18 +00:00
carlossa added 1 commit 2023-03-09 15:00:02 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
9e8150dde3 refs #084200 footnotes dinamico
jgallego requested changes 2023-03-13 06:43:53 +00:00
print/core/components/report-footer/report-footer.html Outdated
@ -7,2 +7,3 @@
</div>
<p class="privacy" v-html="$t('law.privacy')"></p>
<p
v-if="companyCode == '{{company.code}}'"
jgallego commented 2023-03-13 06:43:49 +00:00
Owner
Copy Link

Jo intentaria fer sense posar el if, es a dir, si trobara coicidencia en el yml mostra, si no no. Comentau en Joan si es posible això

Jo intentaria fer sense posar el if, es a dir, si trobara coicidencia en el yml mostra, si no no. Comentau en Joan si es posible això
print/core/components/report-header/report-header.html Outdated
@ -9,3 +9,3 @@
{{company.postCode}} {{company.city}}.
&#9742; {{companyPhone}}
· {{$t('company.contactData')}}
· <span v-if="companyGroup == 'verdnatura'" >verdnatura.es -</span> {{company.email}}
jgallego commented 2023-03-13 06:36:38 +00:00
Owner
Copy Link

La informació com verdnatura.es ha d'estar en taules per a que en la local les fixtures també tinguen un footer visible per exemple

La informació com verdnatura.es ha d'estar en taules per a que en la local les fixtures també tinguen un footer visible per exemple
carlossa added 2 commits 2023-03-13 07:09:47 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
08bda1b05b refs #084200 ultimos cambios footnotes
carlossa added 1 commit 2023-03-13 11:52:58 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
b5394d3925 refs #084200 footer finalizado, web personalizado
carlossa commented 2023-03-13 12:02:15 +00:00
Author
Member
Copy Link

Quan es putje a producció se deurà de afegir a cada company un email corresponent i una web, per a que en el header puga apareixer, també tenen que tindre en footnotes el nom de la traducció, en cas de que no tinga es deuria de mantindre en [NULL] per a que així no tinga res, pero en cas de que tinga es deuria de añadir i al fitxer .yml també

Quan es putje a producció se deurà de afegir a cada company un email corresponent i una web, per a que en el header puga apareixer, també tenen que tindre en footnotes el nom de la traducció, en cas de que no tinga es deuria de mantindre en [NULL] per a que així no tinga res, pero en cas de que tinga es deuria de añadir i al fitxer .yml també
carlossa added 1 commit 2023-03-13 12:03:10 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
36e18ff28c Merge branch 'dev' into 084200-footerAlbaranReport
carlossa requested review from jgallego 2023-03-22 08:52:09 +00:00
jgallego changed title from refs: #084200 mod del footer y readapatacion heade to WIP: refs: #084200 mod del footer y readapatacion heade 2023-03-22 11:50:17 +00:00
carlossa added 2 commits 2023-03-22 13:55:16 +00:00
carlossa added 1 commit 2023-03-27 11:12:12 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
aad8fb0a66 refs #084200 i18n
carlossa changed title from WIP: refs: #084200 mod del footer y readapatacion heade to refs: #084200 mod del footer y readapatacion heade 2023-03-27 11:35:00 +00:00
jgallego requested changes 2023-03-27 12:58:35 +00:00
print/core/components/report-footer/report-footer.js Outdated
@ -4,0 +7,4 @@
},
methods: {
getCompany(code) {
return db.findOne(`
jgallego commented 2023-03-22 09:07:09 +00:00
Owner
Copy Link

subir el findOne a this.company=

subir el findOne a this.company=
carlossa added 1 commit 2023-03-27 13:15:31 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
14f8f98fe9 refs #084200 findOne
jgallego requested changes 2023-03-29 05:53:39 +00:00
print/core/components/report-footer/report-footer.js Outdated
@ -4,0 +5,4 @@
async serverPrefetch() {
const company = await db.findOne(`
SELECT
(SELECT ci.footnotes FROM companyI18n ci WHERE ci.companyFk = c.id) AS footnotes,
jgallego commented 2023-03-29 05:53:31 +00:00
Owner
Copy Link

per fer-ho igual que ho treballem ací, baixala i la poses en el join.
Per altra part, has tingut en compte que funcione quan hi ha varies traduccions? no veig el camp lang

per fer-ho igual que ho treballem ací, baixala i la poses en el join. Per altra part, has tingut en compte que funcione quan hi ha varies traduccions? no veig el camp lang
carlossa added 3 commits 2023-04-05 09:16:22 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
1e71f7487a refs #084200 I18n footer
carlossa changed title from refs: #084200 mod del footer y readapatacion heade to WIP: refs: #084200 mod del footer y readapatacion heade 2023-04-05 09:16:42 +00:00
carlossa added 1 commit 2023-04-05 12:40:05 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
014998952e refs #084200 recipientId
carlossa changed title from WIP: refs: #084200 mod del footer y readapatacion heade to refs: #084200 mod del footer y readapatacion heade 2023-04-05 12:42:07 +00:00
carlossa requested review from jgallego 2023-04-05 12:42:14 +00:00
jgallego approved these changes 2023-04-05 12:46:30 +00:00
joan requested changes 2023-04-17 13:01:07 +00:00
db/changes/231001/00-insertI18n.sql Outdated
@ -0,0 +1,9 @@
-- Auto-generated SQL script #202303291013
INSERT INTO vn.companyI18n (companyFk,lang,footnotes)
joan commented 2023-04-17 13:01:03 +00:00
Contributor
Copy Link

Faltan los template strings y mover a la versión SQL actual

Faltan los template strings y mover a la versión SQL actual
carlossa commented 2023-04-17 13:18:00 +00:00
Author
Member
Copy Link

Resuelto

Resuelto
carlossa added 1 commit 2023-04-17 13:17:21 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
f76727903a update insert
carlossa requested review from joan 2023-04-17 13:17:48 +00:00
joan requested changes 2023-04-17 14:13:42 +00:00
db/changes/231601/00-newCompanyI18n.sql Outdated
@ -0,0 +1,11 @@
-- vn.companyI18n definition
USE vn;
joan commented 2023-04-17 14:13:25 +00:00
Contributor
Copy Link

No utilizar use, mejor utilizar prefijo vn.

No utilizar use, mejor utilizar prefijo `vn`.
db/changes/231601/00-newTableWeb.sql Outdated
@ -0,0 +1 @@
ALTER TABLE vn.company ADD web varchar(100) NULL;
joan commented 2023-04-17 14:12:52 +00:00
Contributor
Copy Link

Template strings

Template strings
carlossa added 1 commit 2023-04-18 06:07:47 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
8b60e9f5fd sql arreglado
carlossa requested review from joan 2023-04-18 06:08:03 +00:00
carlossa added 1 commit 2023-04-18 08:49:07 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
3c639b9a2b refs # cambios entrantes
joan approved these changes 2023-04-18 09:42:34 +00:00
carlossa added 1 commit 2023-04-18 12:18:20 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
274aff14b5 Merge branch 'dev' into 084200-footerAlbaranReport
carlossa added 1 commit 2023-04-18 13:30:28 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
3ead22968a Merge branch 'dev' into 084200-footerAlbaranReport
carlossa added 1 commit 2023-04-20 13:25:11 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
e32939cde9 Merge branch 'dev' into 084200-footerAlbaranReport
carlossa scheduled this pull request to auto merge when all checks succeed 2023-04-20 13:25:56 +00:00
carlossa requested review from jgallego 2023-04-21 07:19:52 +00:00
jgallego approved these changes 2023-04-23 15:41:10 +00:00
carlossa added 1 commit 2023-04-24 06:38:06 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
caed48de01 Merge branch 'dev' into 084200-footerAlbaranReport
carlossa added 1 commit 2023-04-24 09:42:46 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
9d0facd2ba Merge branch 'dev' into 084200-footerAlbaranReport
carlossa scheduled this pull request to auto merge when all checks succeed 2023-04-26 06:07:37 +00:00
carlossa added 1 commit 2023-04-26 06:07:45 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
24a007d609 Merge branch 'dev' into 084200-footerAlbaranReport
carlossa added 1 commit 2023-04-26 06:13:55 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
ad9c189e35 Merge branch 'dev' into 084200-footerAlbaranReport
carlossa scheduled this pull request to auto merge when all checks succeed 2023-04-26 06:14:44 +00:00
carlossa added 2 commits 2023-04-26 07:22:33 +00:00
carlossa canceled auto merging this pull request when all checks succeed 2023-04-26 07:25:58 +00:00
carlossa scheduled this pull request to auto merge when all checks succeed 2023-04-26 07:26:05 +00:00
carlossa canceled auto merging this pull request when all checks succeed 2023-04-26 07:37:15 +00:00
carlossa scheduled this pull request to auto merge when all checks succeed 2023-04-26 07:37:25 +00:00
carlossa added 1 commit 2023-04-26 08:03:14 +00:00
gitea/salix/pipeline/head This commit looks good Details
899ef23541 refs #084200 test back solve
carlossa canceled auto merging this pull request when all checks succeed 2023-04-26 08:03:23 +00:00
carlossa scheduled this pull request to auto merge when all checks succeed 2023-04-26 08:03:38 +00:00
carlossa requested review from jgallego 2023-04-26 08:06:32 +00:00
jgallego approved these changes 2023-04-26 08:45:58 +00:00
jgallego left a comment
Owner
Copy Link

Esta tasca es molt delicà perque afecta a les factures, recorda quan estiga en dev y en test provar-ho be, i que et done el ok l'usuari.
Has d'asegurarte que no vaja a producció sino esta funcionant be.

Esta tasca es molt delicà perque afecta a les factures, recorda quan estiga en dev y en test provar-ho be, i que et done el ok l'usuari. Has d'asegurarte que no vaja a producció sino esta funcionant be.
carlossa merged commit be6d416f67 into dev 2023-04-26 08:54:13 +00:00
carlossa deleted branch 084200-footerAlbaranReport 2023-04-26 08:54:13 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
joan
jgallego
Labels
Clear labels   
CR / Tests passed

Unit tests and e2e passed

  
e2e

Implement e2e

  
Missing tests

Missing tests

  
Needs refactor

   
Simple

Simple check / No CR needed

No Label
CR / Tests passed
e2e
Missing tests
Needs refactor
Simple
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
3 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: verdnatura/salix#1382
No description provided.
Delete Branch "084200-footerAlbaranReport"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?