verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

4146-claim_pickup_order #1090

Merged
alexm merged 12 commits from 4146-claim_pickup_order into dev 2022-11-02 12:08:08 +00:00
Conversation 0 Commits 12 Files Changed 16 +124 -64
alexm commented 2022-10-17 09:47:34 +00:00
Member
Copy Link
No description provided.
alexm added the
CR / Tests passed
 label 2022-10-17 09:47:34 +00:00
alexm added 5 commits 2022-10-17 09:47:37 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
3fd34e0861 feat(claim_pickup_order): modify email
gitea/salix/pipeline/head This commit looks good Details
991893837c correct fixutures from dev
gitea/salix/pipeline/head There was a failure building this commit Details
79b970286c refactor(claim_claimPickupEmail): use text template and external form
gitea/salix/pipeline/head This commit looks good Details
57b2ae770d fix(e2e)
joan requested changes 2022-10-25 07:58:37 +00:00
modules/claim/front/descriptor/index.js Outdated
@ -21,2 +21,3 @@
recipient: this.claim.client.email,
recipientId: this.claim.clientFk
recipientId: this.claim.clientFk,
clientName: this.claim.client.name,
joan commented 2022-10-25 07:50:52 +00:00
Contributor
Copy Link

Estos parámetros podrías obtenerlos desde la propia reclamación en la ruta de back?

Estos parámetros podrías obtenerlos desde la propia reclamación en la ruta de back?
alexm marked this conversation as resolved
print/templates/email/claim-pickup-order/claim-pickup-order.js Outdated
@ -9,2 +9,4 @@
'email-footer': emailFooter.build()
},
created() {
this.instructions = this.$t('description.instructions', [this.id, this.ticketId]);
joan commented 2022-10-25 07:58:19 +00:00
Contributor
Copy Link

Se puede obtener el id de ticket desde la reclamación haciendo una consulta.

Se puede obtener el id de ticket desde la reclamación haciendo una consulta.
alexm marked this conversation as resolved
print/templates/reports/claim-pickup-order/claim-pickup-order.html Outdated
@ -80,4 +80,1 @@
</div>
<p v-html="$t('sections.agency.description')"></p>
<p>{{claimConfig.pickupContact}}</p>
joan commented 2022-10-25 07:56:55 +00:00
Contributor
Copy Link

Deprecar columna

Deprecar columna
alexm marked this conversation as resolved
alexm added 69 commits 2022-10-27 13:12:20 +00:00
gitea/salix/pipeline/head There was a failure building this commit Details
d30065f90a Add vn-input-account tag and logic
gitea/salix/pipeline/head There was a failure building this commit Details
c2813e3633 Removed console logs and other debugging elements
gitea/salix/pipeline/head There was a failure building this commit Details
dff378632b Changed the logic
gitea/salix/pipeline/head There was a failure building this commit Details
7ac7189a8a added maxlength binding, finished logic on insert
gitea/salix/pipeline/head There was a failure building this commit Details
796988bb18 Removed e.stopPropagation
gitea/salix/pipeline/head There was a failure building this commit Details
5ca39c9dd3 Modified TextField to have a insertable option
gitea/salix/pipeline/head This commit looks good Details
9c7ec6fdc9 Implemented Insertable in the textfield class
gitea/salix/pipeline/head This commit looks good Details
452745b04a Added webp to the list of allowed images
gitea/salix/pipeline/head This commit looks good Details
012cd68c89 Added menu to create a new supplier, not working
gitea/salix/pipeline/head There was a failure building this commit Details
e81c39d8dc Send delivery note to refund tickets
gitea/salix/pipeline/head This commit looks good Details
dc6c8f924d feat: Create new Supplier
gitea/salix/pipeline/head There was a failure building this commit Details
594cee12f3 add checks to the existence of object variables
gitea/salix/pipeline/head This commit looks good Details
1603619d81 removed debugging elements
gitea/salix/pipeline/head This commit looks good Details
d91814473e Merge branch 'dev' into 4124-webp-images
gitea/salix/pipeline/head This commit looks good Details
42583a4a16 Merge pull request 'Added webp to the list of allowed images' (!1080) from 4124-webp-images into dev 
Reviewed-on: #1080
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
0cdee89ac3 Button removed when user does not have permissions
gitea/salix/pipeline/head This commit looks good Details
f0b1591b14 Remove debugging elements
gitea/salix/pipeline/head This commit looks good Details
dc53aac163 Merge branch 'dev' into 2612-create-supplier
gitea/salix/pipeline/head There was a failure building this commit Details
cfdcf91be2 Merge branch 'dev' into 3505-closure_refund
gitea/salix/pipeline/head This commit looks good Details
c212dfed88 removed package-lock
gitea/salix/pipeline/head This commit looks good Details
cf50c4690a Merge branch 'dev' into 4153-supplier.fiscal-data
gitea/salix/pipeline/head There was a failure building this commit Details
70c9c3d788 initial back test created, modified DB statetments
gitea/salix/pipeline/head This commit looks good Details
e6481af3a9 delete: transaction
gitea/salix/pipeline/head There was a failure building this commit Details
9290cd6fb6 Finished back tests
gitea/salix/pipeline/head This commit looks good Details
047076f189 changed tests
gitea/salix/pipeline/head There was a failure building this commit Details
a204c6e2b0 Fixed the suppliers not appearing
gitea/salix/pipeline/head There was a failure building this commit Details
470b4485d5 Fixed test and DB structure
gitea/salix/pipeline/head There was a failure building this commit Details
db12ceb369 removed async from the redirect function
gitea/salix/pipeline/head There was a failure building this commit Details
b36acee458 Merge pull request '4153-supplier.fiscal-data' (!1068) from 4153-supplier.fiscal-data into dev 
Reviewed-on: #1068
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
gitea/salix/pipeline/head Build queued... Details
73a69051a8 Merge branch 'dev' into 2612-create-supplier
gitea/salix/pipeline/head There was a failure building this commit Details
dcd858c7d5 feat(print): 4690 - Puppeteer cluster
gitea/salix/pipeline/head There was a failure building this commit Details
192e61a70d hotFix(route_index): fix driverRoutePdf
gitea/salix/pipeline/head There was a failure building this commit Details
7d502c6f57 Merge pull request 'Send delivery note to refund tickets' (!1086) from 3505-closure_refund into dev 
Reviewed-on: #1086
gitea/salix/pipeline/head This commit looks good Details
aa13034ee6 Merge branch 'dev' into 4153-supplier.fiscal-data
gitea/salix/pipeline/head This commit looks good Details
3564cbe246 Merge pull request 'MASTER_4689-hotFix(route_index): fix driverRoutePdf' (!1095) from hotFix_driverRoutePdf2 into master 
Reviewed-on: #1095
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
gitea/salix/pipeline/head There was a failure building this commit Details
c23d58da69 fix if not ticket
gitea/salix/pipeline/head There was a failure building this commit Details
cf0b750304 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head Build queued... Details
ceeab73cf2 Merge pull request '4091-dms_clean_fix2' (!1091) from 4091-dms_clean_fix2 into dev 
Reviewed-on: #1091
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
gitea/salix/pipeline/head There was a failure building this commit Details
04be661b68 Merge pull request 'feat(print): 4690 - Puppeteer cluster' (!1094) from 4690-puppeteer_cluster into dev 
Reviewed-on: #1094
gitea/salix/pipeline/head This commit looks good Details
25e934a591 Merge branch 'dev' into 4153-supplier.fiscal-data
gitea/salix/pipeline/head There was a failure building this commit Details
6a17a634d4 hotFix(receipt): add receiptPdf
gitea/salix/pipeline/head This commit looks good Details
a66c5e6798 acl
gitea/salix/pipeline/head This commit looks good Details
fe95c45c42 Merge pull request 'MASTER_hotFix(receipt): add receiptPdf' (!1100) from hotFix_receiptPdf into master 
Reviewed-on: #1100
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
e80754f280 Added new SQL version
gitea/salix/pipeline/head There was a failure building this commit Details
931a891f71 fix: check client.email exists
gitea/salix/pipeline/head There was a failure building this commit Details
4520443734 fix: Intl polyfill for spanish locale
gitea/salix/pipeline/head This commit looks good Details
5811a0f56e Merge pull request 'MASTER_hotfix: check if email exists' (!1103) from 4708-client.basic-data into master 
Reviewed-on: #1103
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
gitea/salix/pipeline/head There was a failure building this commit Details
9089ba7346 requested changes
gitea/salix/pipeline/head This commit looks good Details
d60f6769b4 Merge branch 'dev' into 4153-supplier.fiscal-data
gitea/salix/pipeline/head This commit looks good Details
39b70ed75f Merge pull request '4153-supplier.fiscal-data' (!1096) from 4153-supplier.fiscal-data into dev 
Reviewed-on: #1096
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
gitea/salix/pipeline/head This commit looks good Details
330af56d2f Intl polyfill
gitea/salix/pipeline/head There was a failure building this commit Details
76d248131c Merge branch 'dev' into 2612-create-supplier
gitea/salix/pipeline/head There was a failure building this commit Details
1196125350 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
7b04464848 Merge branch 'dev' into 2612-create-supplier
gitea/salix/pipeline/head There was a failure building this commit Details
296a743d8a Fix test, remove console log
gitea/salix/pipeline/head There was a failure building this commit Details
418ba65c2e Merge pull request '2612-create-supplier' (!1089) from 2612-create-supplier into dev 
Reviewed-on: #1089
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
gitea/salix/pipeline/head There was a failure building this commit Details
4334907d91 fix(database): updated sql files
gitea/salix/pipeline/head There was a failure building this commit Details
6a2bc5b593 Disabled back tests
gitea/salix/pipeline/head There was a failure building this commit Details
51f95f0261 Fixed error
gitea/salix/pipeline/head There was a failure building this commit Details
714fe32552 Fix error
gitea/salix/pipeline/head This commit looks good Details
9225e8f176 fix tests
alexm added 2 commits 2022-10-28 07:21:41 +00:00
gitea/salix/pipeline/head This commit looks good Details
9170c22d6f fix send email
alexm requested review from joan 2022-10-28 07:23:54 +00:00
alexm added 1 commit 2022-11-02 06:33:21 +00:00
joan approved these changes 2022-11-02 11:37:08 +00:00
alexm added 1 commit 2022-11-02 12:01:21 +00:00
gitea/salix/pipeline/head This commit looks good Details
2a8a8ed84a Merge branch 'dev' into 4146-claim_pickup_order
alexm merged commit 40b6f64468 into dev 2022-11-02 12:08:08 +00:00
alexm deleted branch 4146-claim_pickup_order 2022-11-02 12:08:08 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
joan
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
2 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#1090
No description provided.
Delete Branch "4146-claim_pickup_order"

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?