-
Notifications
You must be signed in to change notification settings - Fork 14
Add carriers for version 1.7.7 #534
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.
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
Draft
SD1982
wants to merge
697
commits into
main
Choose a base branch
from
adapt4eventbus
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from 5 commits
Commits
Show all changes
697 commits
Select commit
Hold shift + click to select a range
969451d
`boThemeAndLogoPage` : Target only themes
Progi1984 874bcbb
`BOBasePage` : Raise timeout to 60s
Progi1984 8609da5
Bump @typescript-eslint/eslint-plugin from 8.44.0 to 8.44.1
dependabot[bot] a578e31
Merge pull request #689 from PrestaShop/dependabot/npm_and_yarn/main/…
Progi1984 4cddd21
Merge pull request #684 from Progi1984/fixMBO
Progi1984 97441d8
Add methods to check the upgrade modal
nesrineabdmouleh a667d27
Fix lint errors
nesrineabdmouleh 9c61da0
Merge pull request #692 from nesrineabdmouleh/AddCheckModalUpgrade
nesrineabdmouleh 92ee6fe
Fix selector in upgrade notification modal
nesrineabdmouleh b712720
Merge pull request #693 from nesrineabdmouleh/FixUpgradeModalIssue
nesrineabdmouleh 7e019b2
Merge pull request #685 from PrestaShop/dependabot/npm_and_yarn/main/…
Progi1984 98767a8
Bump @playwright/test from 1.55.0 to 1.55.1
dependabot[bot] 93fb53b
Merge pull request #690 from PrestaShop/dependabot/npm_and_yarn/main/…
Progi1984 50e5233
Added `dataAttributeTypes`
Progi1984 17efa39
Merge pull request #694 from Progi1984/dataAttributeTypes
Progi1984 989c6ac
Bump @typescript-eslint/eslint-plugin from 8.44.1 to 8.45.0
dependabot[bot] 6e5247a
Bump fast-xml-parser from 5.2.5 to 5.3.0
dependabot[bot] b30a5bd
Merge pull request #697 from PrestaShop/dependabot/npm_and_yarn/main/…
Progi1984 02570a0
Merge pull request #701 from PrestaShop/dependabot/npm_and_yarn/main/…
Progi1984 eeb4a62
Bump @types/node from 24.5.2 to 24.6.2
dependabot[bot] f72835c
Merge pull request #699 from PrestaShop/dependabot/npm_and_yarn/main/…
Progi1984 dadcde5
Bump dotenv from 17.2.2 to 17.2.3
dependabot[bot] a0fbae5
Merge pull request #695 from PrestaShop/dependabot/npm_and_yarn/main/…
Progi1984 d73e6ea
Bump typescript from 5.9.2 to 5.9.3
dependabot[bot] e4242c2
Merge pull request #696 from PrestaShop/dependabot/npm_and_yarn/main/…
Progi1984 42a7882
Bump @s3pweb/keycloak-admin-client-cjs from 26.3.3 to 26.3.4
dependabot[bot] 9d4970f
Merge pull request #698 from PrestaShop/dependabot/npm_and_yarn/main/…
Progi1984 5db11db
`boAttributesCreatePage` : Added method `getValue`
Progi1984 cbc29d4
Merge pull request #703 from Progi1984/boAttributesCreatePageGetValue
Progi1984 5ca3110
Bump @typescript-eslint/parser from 8.45.0 to 8.46.0
dependabot[bot] e20aa95
Merge pull request #705 from PrestaShop/dependabot/npm_and_yarn/main/…
Progi1984 5cb8897
`boDesignPositionsPage` : Improve method `getHookStatus`
Progi1984 5a644ee
Bump @typescript-eslint/eslint-plugin from 8.45.0 to 8.46.0
dependabot[bot] 4a14792
Merge pull request #710 from Progi1984/getHookStatus
Progi1984 a5bd1c7
Merge pull request #709 from PrestaShop/dependabot/npm_and_yarn/main/…
Progi1984 1eb2e48
Bump @types/node from 24.7.0 to 24.7.2
dependabot[bot] d1465f4
Merge pull request #708 from PrestaShop/dependabot/npm_and_yarn/main/…
Progi1984 dd148d3
Bump @playwright/test from 1.55.1 to 1.56.0
dependabot[bot] a453086
Merge pull request #707 from PrestaShop/dependabot/npm_and_yarn/main/…
Progi1984 f4ed98c
Bump @s3pweb/keycloak-admin-client-cjs from 26.3.4 to 26.4.0
dependabot[bot] 2c25a2b
Merge pull request #706 from PrestaShop/dependabot/npm_and_yarn/main/…
Progi1984 4d43e8b
Bump semver from 7.7.2 to 7.7.3
dependabot[bot] e5ac2a1
Merge pull request #704 from PrestaShop/dependabot/npm_and_yarn/main/…
Progi1984 182dac0
Add methods and selectors to test multicarrier
nesrineabdmouleh a4fc9b4
Merge pull request #711 from nesrineabdmouleh/addMethodsForMulticarrier
nesrineabdmouleh 1a44f0d
Fix addProductToCart
nesrineabdmouleh 01a2b92
Merge pull request #712 from nesrineabdmouleh/RevertAddProductToCart
nesrineabdmouleh 2c2d9a6
Add timeout
nesrineabdmouleh 4fd0c2b
Merge pull request #713 from nesrineabdmouleh/AddTimeout
nesrineabdmouleh 5397820
Add carriers for 1.7.7
SD1982 2b138d1
Add condition to main carriers page
SD1982 4aaf0be
Move carriers folder to shipping folder
SD1982 9fb2eac
Add 1.7.7 version for addresses create
SD1982 de822e9
Add condition for addresses page
SD1982 209a7ff
Commit review change suggestions
SD1982 5c951b7
Fix missing element
SD1982 4f26ac3
Add heritage from 8.2 to 1.7.7
SD1982 b44ba68
Add page title and success message to 1.7.7
SD1982 f2615b3
Fix description in jsdocs
SD1982 0908986
Add '.boCarriersPage' to version requirement
SD1982 a58941f
Re-add carrier create page link
SD1982 86c5cc3
implement version for addresses index
SD1982 7a66ae0
Implement orderCreate for few versions
SD1982 d56da22
Add temp log for debug
SD1982 cf517bf
Override createOrder function for 1.7.7 version
SD1982 64efdf5
Remove useless override
SD1982 52d742b
Override paymentMethodSelect for 1.7.7
SD1982 43a5174
Override setPaymentMethod for 1.7.7
SD1982 c2256b0
Remove unwanted comments
SD1982 97394e8
Move selector override from 1.7.7 to 8.2
SD1982 be19b1c
Move carrier button selector override from 1.7.7 to 1.7.8
SD1982 f9943d7
Add carrier requirement for versions below 8.0.0
SD1982 a5ab464
Move adress creation success message from 1.7.7 to 1.7.8
SD1982 5979f0f
Add requirement for lt 8.0.0
SD1982 0938ff8
Move order setPaymentMethod override from 1.7.7 to 1.7.8
SD1982 75e6d9d
Add login compatibility for 1.6.1.24
SD1982 8c0b19a
Remove unwanted changes
SD1982 37bb505
Remove unwanted changes part2
SD1982 b4644c9
Remove unwanted changes part3
SD1982 b49a7d4
Add compat requirement in pages
SD1982 23cff08
Add version to utils
SD1982 56c996e
Remove temporary carriersCreate
SD1982 e1d16e4
Remove temporary login require
SD1982 a80e4bb
Add lt for version under 9.0.0
SD1982 555f983
Try require 8.2 on dashboard 1.6
SD1982 c04d1d3
Add require for dashboardPage under 9.0.0
SD1982 765e00a
Try implementes carriers link to 1.6.1
SD1982 3916bfb
Correctly implementes Dashboard
SD1982 ba185ae
Correctly require
SD1982 618ca16
Correctly export carrierCreate from 8.2
SD1982 2216f87
Override goToAddNewCarrier for 1.6 versions
SD1982 7d892c0
Override CustomerParentLink in 1.6
SD1982 8e3876f
Override addNewAddress link for 1.6
SD1982 d88c278
Override addNewAddress page title for 1.6
SD1982 57de517
Move title override to correct page
SD1982 6571be6
Override newAddress form selectors
SD1982 fa43d2a
Override createEditAdress
SD1982 c45fffe
Total override createEditAddress for 1.6
SD1982 ef65d09
Add missing locator
SD1982 38297c9
Update alert block locators
SD1982 4db3385
Update successful creation txt
SD1982 b6501a4
Update success block
SD1982 8194bfe
Override save and getSuccessTxt
SD1982 e2bc6aa
Update successful creation txt
SD1982 d3c0653
Add OrderParentLink for 1.6
SD1982 226cf47
Override newOrderPage link for 1.6
SD1982 76b2eb2
Add order customer searh selector
SD1982 01b487f
Override order customer selection locators
SD1982 9c4cd26
Edit nth-child for customer card selection
SD1982 134e721
Override checkoutHistoryBlock locator for 1.6
SD1982 a9f2e0f
Add develop to require for lt than 9.0
SD1982 7530a90
Remove readonly for name and transit name to carrier
SD1982 242a40c
Add carriers for 1.7.7
SD1982 f0399f9
Add condition to main carriers page
SD1982 82f7351
Move carriers folder to shipping folder
SD1982 9a5704c
Add 1.7.7 version for addresses create
SD1982 448faf9
Add page title and success message to 1.7.7
SD1982 b7ca283
Fix description in jsdocs
SD1982 b5dd8cf
Re-add carrier create page link
SD1982 6df6b5d
implement version for addresses index
SD1982 62b6723
Add temp log for debug
SD1982 9ac8644
Override createOrder function for 1.7.7 version
SD1982 c9e6939
Override paymentMethodSelect for 1.7.7
SD1982 8818e27
Override setPaymentMethod for 1.7.7
SD1982 5043a44
Remove unwanted comments
SD1982 ee8f86f
Move selector override from 1.7.7 to 8.2
SD1982 f5a2bbb
Move carrier button selector override from 1.7.7 to 1.7.8
SD1982 3f9358f
Move adress creation success message from 1.7.7 to 1.7.8
SD1982 776e66e
Move order setPaymentMethod override from 1.7.7 to 1.7.8
SD1982 8089397
Add login compatibility for 1.6.1.24
SD1982 613a0bc
Remove unwanted changes
SD1982 6c75a4f
Remove unwanted changes part2
SD1982 b4d0d8b
Remove unwanted changes part3
SD1982 2246277
Add compat requirement in pages
SD1982 15a3b7e
Remove temporary carriersCreate
SD1982 7594bfa
Remove temporary login require
SD1982 ab8fc48
Try implementes carriers link to 1.6.1
SD1982 b85c1af
Correctly implementes Dashboard
SD1982 794b3f7
Override createEditAdress
SD1982 be489ec
Total override createEditAddress for 1.6
SD1982 b9cdaa9
Add missing locator
SD1982 8da4498
Update alert block locators
SD1982 056fa7f
Update successful creation txt
SD1982 0c22713
Update success block
SD1982 eefcbc7
Override save and getSuccessTxt
SD1982 64cc238
Update successful creation txt
SD1982 8b36515
Add OrderParentLink for 1.6
SD1982 f321ad4
Update pdfjs version to try remove unwanted warning logs
SD1982 830d78f
Rollback
SD1982 a2b01ef
Edit goToProduct for classic FO
SD1982 e842c84
Increase timeout in createEditAddress
SD1982 597331b
Edit require for catalog/product/create/tabDescription
SD1982 38843d6
Edit setProductDescription for 8.2.1
SD1982 ba6f797
Edit versionning for productDescription
SD1982 62acc4b
Edit productDescription
SD1982 7073710
Edit typo on file name
SD1982 bf84db7
Remove function from 8.2
SD1982 8c1db12
Rollback function delete
SD1982 c85ae55
Add setProductName for 8.2
SD1982 a8103f7
Add search results classic page for 8.2 version
SD1982 f96dcce
Add selector for localization button import
SD1982 b9c5ed9
Fix typo
SD1982 1bfd080
fix bad require
SD1982 ab4cb35
Fix another typo
SD1982 24b9fdc
Edit locator for localization for 1.6
SD1982 cb1176e
Add localization link for 1.6.1
SD1982 6c7b7a7
Update 1.6 locators for localization
SD1982 b186c04
Edit locator for localization select
SD1982 01a7289
Try edit importLocalizationPack method
SD1982 4542dc0
Edit select locator to click directly on div
SD1982 7e281d2
Use id instead of class
SD1982 eb3a231
Replace input locator by textbox
SD1982 a056822
Switch to playwright locators for importLocalizationPack function
SD1982 8911fb5
Edit data toggle check
SD1982 bcd1320
Edit toggle type
SD1982 4690775
Edit toggle type in develop too
SD1982 061bc72
Update import button locator in localization
SD1982 02c51b2
Try using <i> for import btn
SD1982 542dd79
Try click button by name
SD1982 4e65011
handle succes notifications for 1.6.1
SD1982 56b8bcd
Add catalog parent and products subtab links
SD1982 8b4dc26
overwrite newProductButton for 1.6.1
SD1982 64f250b
Start implements productCreate for 1.6.1 ::blocked
SD1982 456c576
Update develop localization
SD1982 55dd745
Update timeout to isStepCompleted
SD1982 091153b
Edit createCarrier for 8.2
SD1982 040bef2
Try better way for handlingCost and freeShipping
SD1982 55ef158
Handle set enabled
SD1982 46a5ffd
Add new way to handle toggle for freeshipping, handlingcost, enable
SD1982 d2bdfd5
Overide locator for carrier enable in 1.7.7
SD1982 8a4ecf5
Second overide for carriers creation
SD1982 cb80370
Force click freeshipping and shipping cost
SD1982 e87b87c
Add force enable
SD1982 0f19d6c
Remove force click
SD1982 dce53a4
Try other way to click
SD1982 27bc82e
Try rollback to the old method
SD1982 e4495ab
Try again another way for carriers
SD1982 db73241
Try other method for freeshipping and handling cost
SD1982 f20b9e1
Try remove locator overide for 1.7.7.8
SD1982 51720e1
Try click by label for carriers??
SD1982 f23a69c
Try add locator
SD1982 03afa43
Try other way ...
SD1982 d70624f
edit name error
SD1982 b91aa64
Try getByRole
SD1982 4726596
Add missing name to get by role
SD1982 7a487e1
Try conditions on ID#
SD1982 04eea87
Try force click
SD1982 a968c5b
try click instead of set checked
SD1982 8cdef2b
force click enable
SD1982 13e976d
Try inverse active on and off
SD1982 359c076
Back to setChecked for enable button
SD1982 25100c5
Comment waitForResponse
SD1982 4208758
Comment another -waitForResponse-
SD1982 7cb2bc8
Add await to dialogListener
SD1982 97275a2
Try force remove dialog handler before handling new one
SD1982 1ca773f
Add carriers for 1.7.7
SD1982 dc8384d
Move carriers folder to shipping folder
SD1982 82b3a1b
Add page title and success message to 1.7.7
SD1982 92b91ea
Fix description in jsdocs
SD1982 5ce5594
Re-add carrier create page link
SD1982 b7f9286
implement version for addresses index
SD1982 49087b1
Add temp log for debug
SD1982 0c42696
Override setPaymentMethod for 1.7.7
SD1982 095a51a
Remove unwanted comments
SD1982 3c171d4
Move selector override from 1.7.7 to 8.2
SD1982 d14a57e
Move carrier button selector override from 1.7.7 to 1.7.8
SD1982 ebcfe2a
Move adress creation success message from 1.7.7 to 1.7.8
SD1982 23c4877
Add login compatibility for 1.6.1.24
SD1982 9998fae
Remove unwanted changes
SD1982 0772cee
Remove unwanted changes part2
SD1982 5401654
Remove unwanted changes part3
SD1982 89203ab
Add compat requirement in pages
SD1982 a5a7091
Remove temporary login require
SD1982 0a8c128
Try implementes carriers link to 1.6.1
SD1982 1aace3d
Correctly implementes Dashboard
SD1982 f5d3078
Update alert block locators
SD1982 d7952c0
Update success block
SD1982 a521256
Override save and getSuccessTxt
SD1982 aafd076
Update pdfjs version to try remove unwanted warning logs
SD1982 ebd2ac4
Rollback
SD1982 b674d17
Edit require for catalog/product/create/tabDescription
SD1982 db9173a
Edit setProductDescription for 8.2.1
SD1982 b81e579
Edit versionning for productDescription
SD1982 4d30c18
Edit productDescription
SD1982 3fc6ecb
Edit typo on file name
SD1982 e153d1f
Add setProductName for 8.2
SD1982 6c0cfb5
Update 1.6 locators for localization
SD1982 b87a09c
Edit locator for localization select
SD1982 772f7e9
Edit createCarrier for 8.2
SD1982 5d3fb6c
Merge remote-tracking branch 'origin/adapt4eventbus' into adapt4eventbus
SD1982 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,3 +3,4 @@ | |
|
|
||
| ## IDE | ||
| /.vscode/ | ||
| /.idea/ | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| // Import pages | ||
| import {BOAddressesCreatePageInterface} from '@interfaces/BO/customers/addresses/create'; | ||
| import {BOAddressesCreatePage as BOAddressCreatePageVersion} from '@versions/develop/pages/BO/customers/addresses/create'; | ||
|
|
||
|
|
||
| class BOAddressesCreatePage extends BOAddressCreatePageVersion implements BOAddressesCreatePageInterface { | ||
| /** | ||
| * @constructs | ||
| * Setting up texts and selectors to use in orders page | ||
| */ | ||
| constructor() { | ||
| super(); | ||
| // Header links | ||
| this.saveAddressButton = '.form-horizontal button'; | ||
| } | ||
| } | ||
|
|
||
| module.exports = new BOAddressesCreatePage(); | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| // Import pages | ||
| import {BOCarriersPageInterface} from '@interfaces/BO/shipping/carriers'; | ||
| import {BOCarriersPage as BOCarriersPageVersion} from '@versions/develop/pages/BO/shipping/carriers'; | ||
SD1982 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
| class BOCarriersPage extends BOCarriersPageVersion implements BOCarriersPageInterface { | ||
| /** | ||
| * @constructs | ||
| * Setting up texts and selectors to use in orders page | ||
| */ | ||
| constructor() { | ||
| super(); | ||
| // Header links | ||
| this.addNewCarrierLink = 'a#page-header-desc-carrier-new_carrier'; | ||
| } | ||
| } | ||
|
|
||
| module.exports = new BOCarriersPage(); | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.