Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

No tracking Number for return product tab #26056

Merged
merged 9 commits into from Feb 1, 2022
Merged

No tracking Number for return product tab #26056

merged 9 commits into from Feb 1, 2022

Conversation

ghost
Copy link

@ghost ghost commented Oct 2, 2021 •
edited by Progi1984

Questions Answers
Branch? develop
Description? No tracking Number for return product.
Type? bug fix
Category? BO
BC breaks? yes
Deprecations? no
Fixed ticket? Fixes #19200
How to test? Made a return and check that the words are right. DevCore must check for deleted variables
Possible impacts? Please indicate what parts of the software we need to check to make sure everything is alright.

📓 BC break

  • Remove property $carrierId in OrderReturnForViewing.php
  • Remove property $trackingNumber in OrderReturnForViewing.php
  • Remove property $trackingUrlr in OrderReturnForViewing.php

This change is Reviewable

@ghost ghost self-requested a review as a code owner October 2, 2021 08:20
@prestonBot prestonBot added develop Branch Bug fix Type: Bug fix Waiting for wording Status: action required, waiting for wording labels Oct 2, 2021
@Julievrz Julievrz added Wording ✔️ Status: check done, wording approved and removed Waiting for wording Status: action required, waiting for wording labels Oct 14, 2021
@atomiix atomiix closed this Oct 25, 2021
@atomiix atomiix reopened this Oct 25, 2021
@atomiix
Copy link
Contributor

atomiix commented Nov 18, 2021

@okom3pom Can you solve the conflict, please? :)

@Progi1984 Progi1984 added the Waiting for author Status: action required, waiting for author feedback label Nov 29, 2021
@ghost
Copy link
Author

ghost commented Dec 6, 2021 •
edited by ghost

Hello @atomiix

I am waiting for an answer from @matks and @PierreRambaud

#26056 (comment)

I can rebase and open a new issue

@matks
Copy link
Contributor

matks commented Dec 7, 2021

Answer provided by @PierreRambaud 👍 waiting for the new changes

@prestonBot prestonBot added Waiting for wording Status: action required, waiting for wording BC break Type: Introduces a backwards-incompatible break and removed Wording ✔️ Status: check done, wording approved labels Dec 9, 2021
@ghost
Copy link
Author

ghost commented Dec 9, 2021

Normaly it's good

Progi1984
Progi1984 previously approved these changes Dec 13, 2021
View reviewed changes
@Progi1984 Progi1984 removed the Waiting for wording Status: action required, waiting for wording label Dec 13, 2021
@PierreRambaud PierreRambaud removed the Waiting for author Status: action required, waiting for author feedback label Dec 13, 2021
@matks matks added the Waiting for QA Status: action required, waiting for test feedback label Dec 21, 2021
PierreRambaud
PierreRambaud previously approved these changes Dec 21, 2021
View reviewed changes
@khouloudbelguith khouloudbelguith self-assigned this Dec 21, 2021
@khouloudbelguith
Copy link
Contributor

Hi @okom3pom,

I cannot test this PR.
I have an exception in the FO
image
This PR is blocked by this issue: #26656

Thanks!

@khouloudbelguith khouloudbelguith added the Blocked Status: The issue is blocked by another task label Dec 21, 2021
@sarahdib sarahdib added the Waiting for author Status: action required, waiting for author feedback label Dec 22, 2021
Touxten and others added 9 commits January 21, 2022 14:53
@Touxten @boubkerbribri
Good Wording
d4606b3
@Touxten @boubkerbribri
Replace Status name By Status
136c9fc
@Touxten @boubkerbribri
Good Return number
73d3bcc
@Touxten @boubkerbribri
Wording
885b356
@Touxten @boubkerbribri
Feature : add link
87c5a8d
@Touxten @boubkerbribri
Change variable name
d2748ca 
Update src/PrestaShopBundle/Resources/views/Admin/Sell/Order/Order/Blocks/View/merchandise_returns.html.twig

Co-authored-by: Ibrahima SOW <sowbiba@hotmail.com>

Fix rebase
@Touxten @boubkerbribri
Remove useless variables
32bc2c2 
Fix removed int

fix int
@Touxten @boubkerbribri
Fix order retrun link
3dadf3e
@nesrineabdmouleh @boubkerbribri
Rebase + Fix 06_merchandiseReturnsTab UI test
49b29e0
@prestonBot prestonBot added the Waiting for wording Status: action required, waiting for wording label Jan 21, 2022
@boubkerbribri
Copy link
Contributor

Hello @okom3pom,
To fix tests, we were missing a rebase and we done it wrongly first.
But Now it's FIXED (with a cherry-pick of your commits and the UI tests fix).
I'm very Sorry for the inconvenience but Can you check please that nothing is missing from your PR please ?

@boubkerbribri boubkerbribri removed Waiting for QA Status: action required, waiting for test feedback Waiting for wording Status: action required, waiting for wording labels Jan 21, 2022
@ghost
Copy link
Author

ghost commented Jan 26, 2022

It"s ok !

@boubkerbribri boubkerbribri requested a review from a team January 26, 2022 14:05
@boubkerbribri boubkerbribri removed the Waiting for author Status: action required, waiting for author feedback label Jan 26, 2022
@boubkerbribri boubkerbribri added this to the 8.0.0 milestone Jan 26, 2022
@boubkerbribri
Copy link
Contributor

Thanks @okom3pom (and sorry again)
We will wait for reviews to add QA ✔️ .

@PierreRambaud PierreRambaud added the Waiting for QA Status: action required, waiting for test feedback label Feb 1, 2022
boubkerbribri
boubkerbribri approved these changes Feb 1, 2022
View reviewed changes
Copy link
Contributor

@boubkerbribri boubkerbribri left a comment •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Validated by @khouloudbelguith previously and UI tests are fixed by @nesrineabdmouleh. So it's QA ✔️

@boubkerbribri boubkerbribri added QA ✔️ Status: check done, code approved and removed Waiting for QA Status: action required, waiting for test feedback labels Feb 1, 2022
@Progi1984 Progi1984 merged commit 120b3fb into PrestaShop:develop Feb 1, 2022
@Progi1984 Progi1984 deleted the fix-wording branch February 1, 2022 09:51
@Progi1984
Copy link
Contributor

Thanks @okom3pom @boubkerbribri @nesrineabdmouleh & @khouloudbelguith

@matks matks added the Needs documentation Needs an update of the developer documentation label Jul 19, 2022
@kpodemski kpodemski added Documentation ✔️ Developer documentation is up-to-date and removed Needs documentation Needs an update of the developer documentation labels Aug 4, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@khouloudbelguith khouloudbelguith

Labels
BC break Type: Introduces a backwards-incompatible break Bug fix Type: Bug fix develop Branch Documentation ✔️ Developer documentation is up-to-date QA ✔️ Status: check done, code approved
Projects
None yet
Milestone
8.0.0
Development

Successfully merging this pull request may close these issues.

Return tab on order BO page has no "tracking number" + wrong wording