Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* SUPESC-402: Fixed CORS Error when working with VUE and React Frontend. (#1004) * SUPESC-402: updated `spryker/glue-application` version, added `CorsValidateHttpRequestPlugin`. * SUPESC-433: Added the possibility to configure the error renderer for Glue. (#1017) * SUPESC-433: updated `spryker/error-handler` module version, added api error renderer to configuration. * CC-11331: Fixed getting the customer's default shipping address. (#1056) * CC-11331: Integration for CC-11331: Security issue: Wrong behavior of Address::getDefaultShippingAddress(). * CC-15121 Integrate plugin * CC-15121 Integrate plugin (#1062) * CC-11331: Fixed getting the customer's default shipping address. * TE-10644 Integration TE-10646 and TE-10648 * TE-10644 Integrate spryker-sdk integrator * TE-10644 Trigger build * CC-15728 Updated composer.lock. * TE-10644 Fixed version in README * CC-15728: Integrated UI for discount products * CC-15728: Fixed styles according to CR * CC-15728: Fixed styles according to CR * CC-15728: Fixed styles according to CR * CC-13618: Fixed code style according to CR * added cloud deploy file * TE-10644 Fir travis build * TE-10644 Removed debug information * updated cloud deploy file * CC-15728: Removed color selector * CC-15728 Updated promotion discount feature version. * Removing basic auth frontend-auth * CC-15920 README update (#1071) * CC-15728 Updated Travis config. * create deploy.spryker-mpb2cintt.yml * added US store * modify deploy.spryker-mpb2cintt.yml * updated deploy yml * added EU_US install script * added EU_US demodata import * Update ACL tests * Update ACL tests * Update ACL tests * Update ACL tests * Revert changes * MP-3934 Integrate Merchant Product Approval * MP-3934 CS fix * MP-3934 Add required feature repository * MP-5770 Integrate Merchant Product Offer Storage refactoring TD epic * MP-3934 Fixes after CR * MP-6161 MerchantUser should not be able to login into Backoffice epic integration * Us demo data (#1075) * MP-5770 Fix type hint * fixing tests * Add price schedule for all stores and with correct end date * Fix volume prices * Make some products unavailable by default * Fix product quantity * MP-3934 Fixes after CR * MP-5770 Fixes after CR * MP-3934 Update composer.lock * Fix colors for products * Update composer.lock * Update spryker/product-management module * MP-6368: added urls for merchant portal * removed us store from de_at cluster * MP-6368: composer fix * added deploy.spryker-b2c-intts * removed _eu * removed _eu * OPS-2168 Updated configuration for staging. * MP-6685: merchant order id on detail page * MP-6686: added merchant filter for availability page in zed * MP-6687: product merchant isn't displayed on wishlist page fixed * Update src/Pyz/Zed/AvailabilityGui/AvailabilityGuiDependencyProvider.php Co-authored-by: Roman Havrylko <70894038+romanhavrylko@users.noreply.github.com> * MP-6686: doc fix * MP-6687: unnecessary changes * CC-16542 Updated demodata for concrete product (#1087) * Changed quantity to 0 for concrete product with sku 107938 in import data Co-authored-by: andrew-pushkar <andrew-pushkar@bitbucket.com> * MP-6691: fix to allow merchant users with root access login in BackOffice * MP-6691: BC fix * MP-6691: added TODO * MP-6601: migrate Angular from 9 to 12 version for MP * MP-6601: adjust .prettierignore. Fix code style * MP-6601: adjust tslint config * MP-6601: update composer * mp-6692: Created configs for products in backoffice and updated controller with template for Merchant Portal products * mp-6692: fixed template, updated configs * mp-6692: removed not needed files * Update product_abstract_form.twig * CC-16506 Integrated configurable bundle carts API. * MP-6692 Fix update product form rendering for approved products * CC-16533 Added check for empty discount priority value in data import. (#1085) * CC-16533 Added check for empty discount priority value in data import. * CC-16533 Updated condition. * Release branch updates (#1091) * CC-16542 Updated demodata for concrete product (#1087) * Changed quantity to 0 for concrete product with sku 107938 in import data Co-authored-by: andrew-pushkar <andrew-pushkar@bitbucket.com> * CC-16533 Added check for empty discount priority value in data import. (#1085) * CC-16533 Added check for empty discount priority value in data import. * CC-16533 Updated condition. Co-authored-by: Andrii Pushkar <zingeon1@gmail.com> Co-authored-by: andrew-pushkar <andrew-pushkar@bitbucket.com> Co-authored-by: Roman Havrylko <70894038+romanhavrylko@users.noreply.github.com> * CC-14879: Integrated fixed bug. (#1088) * update spryker module dependencies * CC-16580: Introduced css classes for colors in the lower case (#1095) * TE-10990 Integrated replaced static URL sign secret with ENV key. * create deploy.spryker-b2csec.yml * PPLUS-879: B2C is compliant with BE upgradability checks (minor+patches) (#1099) * PPLUS-879: NotUnique:Constant & NotUnique:Method * PPLUS-879: NotUnique:Constant & NotUnique:Method * PPLUS-879: NotUnique:Constant & NotUnique:Method / fix * PPLUS-879: NotUnique:TransferName & NotUnique:TransferProperty * PPLUS-879: NotUnique:Constant & NotUnique:Method / fix * PPLUS-879: NotUnique:Method * PPLUS-879: Added code complacence checks to Travis * PPLUS-879: PrivateApi:Extension ProductReviewForm * PPLUS-879: Extends functional provider * PPLUS-879: Private Api:Dependency Usage widgets and form fixed * PPLUS-879: Private Api:Dependency Usage in ProductStorage fixed * PPLUS-879: Private Api:Dependency moved SCO fix * PPLUS-879: Updated travis job * PPLUS-879: Reverted Dependency providers to previous format * PPLUS-879: Removed uses from project level * PPLUS-879: Renamed method to updatePyzItemState * PPLUS-879: moved getPyzProductReviewFormData to project level * PPLUS-879: Reverted DB column name where DB Table has Pyz prefix * Update .travis.yml * PPLUS-879: Reverted TransferProperty name * PPLUS-879: Review update * PPLUS-879: Updated guzzlehttp/psr7 * PPLUS-879: Updated SubmitController * PPLUS-879: Include Rabbit fix for QA * PPLUS-879: Deleted LocaleCmsPageData from project level * PPLUS-879: Updated spryker/cms-content-widget * PPLUS-879: Moved method getPyzProductReviewFormData on project level * PPLUS-879: Review fixes * PPLUS-879: Review fixes * PPLUS-879: Review fixes * PPLUS-879: Review fixes (second round) * PPLUS-879: Review fixes (second round) * PPLUS-879: Review fixes (upgrda spryker-sdk to 0.4.0) * fix composer.lock * Revert "fix composer.lock" This reverts commit c7c3b0e1adf9ca6d4f14327c5988b884b2f3667d. * revert spryker-sdk/phpstan-spryker and update spryker/cms-content-widget * update to spryker-sdk/phpstan-spryker:^0.4.0 * fix Upgradability memory issue and displaying errors * update spryker/configurable-bundle-data-import * PPLUS-879 Updated composer Co-authored-by: v.strelchenko <v.strelchenko@gamingtec.com> Co-authored-by: Aleksandr Myrnyi <oleksandr.myrnyi@spryker.com> Co-authored-by: Dmitry Lymarenko <dmitry.lymarenko@spryker.com> * SUPESC-461 Replaced node-sass to dart sass (#1096) * SUPESC-461: Replaced node-sass to dart sass * SUPESC-461: Reverted update for `lodash-es` * CC-16563: added event to dependency provider (#1093) * CC-16493 Fixed query for assigning/unassigning products to the SALE label (#1084) * CC-16493 SALE Product Label is not working * Adjusted `ExampleProductSalePageQueryContainer:queryRelationsBecomingInactive()` so it queries right abstract products to unassign SALE label from them. * Adjusted `ExampleProductSalePageQueryContainer:queryRelationsBecomingActive()` so it queries right abstract products to assign SALE label to them. * Added new parameters `$currentStoreId` and `$currentCurrencyId` to `ExampleProductSalePageQueryContainerInterface:queryRelationsBecomingActive()` to query abstract products related only to the current store and currency. * Added `CurrencyFacadeInterface` to dependencies. * CC-16493 Fixed query for assigning/unassigning products to the SALE label * Reverted the type changes for ExampleProductSalePageQueryContainer::queryRelationsBecomingActive() * CC-16493 Fixed query for assigning/unassigning products to the SALE label * Fixed query for assigning products to the SALE label * CC-16493 Fixed query for assigning/unassigning products to the SALE label * Tiny fixes according to CR comments * CC-16493 Fixed query for assigning/unassigning products to the SALE label * Fixed query * CC-16493 Fixed query for assigning/unassigning products to the SALE label * Added condition to the query considering the price mode * Fixed query * CC-16493 Fixed query for assigning/unassigning products to the SALE label * Tiny PR fixes * CC-16493 Fixed query for assigning/unassigning products to the SALE label * Tiny PR fixes * CC-16493 Fixed query for assigning/unassigning products to the SALE label * Tiny PR fixes * CC-16493 Fixed query for assigning/unassigning products to the SALE label * Tiny PR fixes * CC-16493 Fixed query for assigning/unassigning products to the SALE label * Tiny PR fixes * CC-16493 Fixed query for assigning/unassigning products to the SALE label * Tiny PR fixes * CC-16493 Fixed query for assigning/unassigning products to the SALE label * Added condition for unassign SALE label when origin and default prices are the same. * CC-16493 Fixed query for assigning/unassigning products to the SALE label * Resolved conflicts * CC-16493 Fixed query for assigning/unassigning products to the SALE label * Tiny PR fixes * CC-16493 Fixed query for assigning/unassigning products to the SALE label * Tiny CS fixes Co-authored-by: andrew-pushkar <andrew-pushkar@bitbucket.com> * Updated feature versions. * Locked module versions. * Updated flysystem to the latest majors. * Fixed dependencies. * Updated flysystem. * Updated flysystem. * Merged b2c. Updated dependencies. * Fixed merge issues. * Locked composer versions. * TE-9191 Dependency Upgrades (#1102) * TE-9892 updated the remaining dependencies. * TE-9892 required flysystem. * Rise composer module versions. * Fixed acceptance tests. * Fixed composer. * Updated docker version. * Added URI_SIGNER_SECRET_KEY configuration. * Updated composer versions. * Updated module versions. * Locked module versions. (#1106) * Updated feature versions. * Locked module versions. * Updated flysystem to the latest majors. * Fixed dependencies. * Updated flysystem. * Updated flysystem. * Rise composer module versions. * Fixed acceptance tests. * Fixed composer. * Updated docker version. * Added URI_SIGNER_SECRET_KEY configuration. * Updated module versions. * TE-10988: Replaced static URL sign secret with ENV key. (#1101) * TE-10988: Integrated bug-ticket. * TE-10988: Updated composer.lock after merging. * Updated FE dependencies. * Removed b2b models. * Fixed phpstan. * Fixed travis. * Fix Travis issues and data import * Fix Travis issues and data import * Fix Travis issues and data import * MP-6752 Updated `build-static` commands in the docker.yml * APPS: 3915 AOP B2C inegration (#1103) * added cloud deploy file * updated cloud deploy file * Removing basic auth frontend-auth * added US store * updated deploy yml * added EU_US install script * added EU_US demodata import * Add price schedule for all stores and with correct end date * Fix volume prices * Make some products unavailable by default * Fix product quantity * Fix colors for products * removed us store from de_at cluster * added deploy.spryker-b2c-intts * removed _eu * removed _eu * OPS-2168 Updated configuration for staging. * Release branch updates (#1091) * CC-16542 Updated demodata for concrete product (#1087) * Changed quantity to 0 for concrete product with sku 107938 in import data Co-authored-by: andrew-pushkar <andrew-pushkar@bitbucket.com> * CC-16533 Added check for empty discount priority value in data import. (#1085) * CC-16533 Added check for empty discount priority value in data import. * CC-16533 Updated condition. Co-authored-by: Andrii Pushkar <zingeon1@gmail.com> Co-authored-by: andrew-pushkar <andrew-pushkar@bitbucket.com> Co-authored-by: Roman Havrylko <70894038+romanhavrylko@users.noreply.github.com> * create deploy.spryker-b2csec.yml * APPS:3915 move project files from suite-nonsplit * APPS:3915 composer update * APPS:3915 adjusted payment.twig * APPS:3915 style fixes * APPS:3915 style fixes * APPS:3915 fixed data import * APPS:3915 changed back product_abstract.csv * APPS:3915 fixed data import * APPS:3915 fixed config and tests * APPS:3915 fixed security problems * APPS:3915 fixed CR comments * APPS:3915 fixed CR comments * APPS:3915 fixed tests * APPS:3915 removed redundunt classes * APPS:3915 added upcs to data import * APPS:3915 removed new upcs from data import * APPS:3915 add upcs to product_abstract.csv data import * APPS:3915 removed all upcs * APPS:3915 composer update * APPS:3915 composer update with locked versions * APPS:3915 composer update with locked versions for require-dev * APPS:3915 moved new packages from require to require-dev * APPS:3915 added new packages to require * APPS:3915 removed spryker-shop/payment-page from require * APPS:3915 sort composer alphabetically * APPS:3915 sort composer alphabetically Co-authored-by: Eugene Chernyi <eugene.chernyi@spryker.com> Co-authored-by: iddqd388 <34138521+iddqd388@users.noreply.github.com> Co-authored-by: Roman Havrylko <roman.havrylko@spryker.com> Co-authored-by: Jeremy Fourna <jeremyfourna@hey.com> Co-authored-by: Dmitry Lymarenko <37305577+DmitryLymarenko@users.noreply.github.com> Co-authored-by: Andrii Pushkar <zingeon1@gmail.com> Co-authored-by: andrew-pushkar <andrew-pushkar@bitbucket.com> Co-authored-by: Roman Havrylko <70894038+romanhavrylko@users.noreply.github.com> Co-authored-by: Stanislav Russu <stanislavrussu@Stanislav-Russu.local> * Fix Travis issues and data import * Fix Travis issues and data import * Fix Travis issues and data import * Fix Travis issues and data import * Fix Travis issues and data import * Fix Travis issues and data import * Fix Travis issues and data import * Fix Travis issues and data import * Fix Travis issues and data import * Fix Travis issues and data import * Fix Travis issues and data import * Fix Travis issues and data import * Fix Travis issues and data import * Fix Travis issues and data import * Fix Travis issues and data import * Fix Travis issues and data import * Fix Travis issues and data import * Updated composer. * Updated composer. * Fix Travis barcode issue * Merge branch 'master' into bugfix/fix-travis-0422 # Conflicts: # composer.json # composer.lock * Fix Travis * TE-16635: Adjusted product volume-price import files. (#1110) * TE-16635: Adjusted import files. * TE-16635: Adjusted import files. * Merge branch 'master' into bugfix/fix-travis-0422 # Conflicts: # composer.json # composer.lock * Fix Travis * Merge branch 'master' into bugfix/fix-travis-0422 # Conflicts: # composer.json # composer.lock * Merge branch 'master' into bugfix/fix-travis-0422 # Conflicts: # composer.json # composer.lock * Fix Travis * Fix Travis * Fix Travis * Fix Travis * Updated copmposer (#1112) * Locked phpstan version (#1113) * Fix Travis * Fix Travis * Fix Travis * APPS:3960 adjust twig templates for AOP (#1111) * APPS:2344:2345 adjusted twig templates * APPS:2344:2345 adjusted twig templates * APPS:3960 adjusted twig templates * APPS:3960 adjusted twig templates * Updated CI jobs to use php7.4 * Fixed MP build * Fixed MP build * Fixed MP build * Fixed CS. * Fixed MP build. * Updated composer. * Fixed composer name. * Updated composer hash. * CC-13861: integration. * MP-6711: composer modules updated, integrated Pyz ProductApprovalGuiConfig. * MP-6711: clean code. * [APPS-2942] ACP Oauth usage integration. * [APPS-2942] Security fix. * MP-6723: duplicating product offers fix integrated. * MP-6740: backoffice login for merchant portal users integrated. * MP-6740: security update. * Removed duplicated config key. * Integrated licenses. * MP-6712 Fix demodata default merchant product approval status * Release -> master (#1117) * added cloud deploy file * updated cloud deploy file * Removing basic auth frontend-auth * added US store * updated deploy yml * added EU_US install script * added EU_US demodata import * Add price schedule for all stores and with correct end date * Fix volume prices * Make some products unavailable by default * Fix product quantity * Fix colors for products * removed us store from de_at cluster * added deploy.spryker-b2c-intts * removed _eu * removed _eu * OPS-2168 Updated configuration for staging. * Release branch updates (#1091) * CC-16542 Updated demodata for concrete product (#1087) * Changed quantity to 0 for concrete product with sku 107938 in import data Co-authored-by: andrew-pushkar <andrew-pushkar@bitbucket.com> * CC-16533 Added check for empty discount priority value in data import. (#1085) * CC-16533 Added check for empty discount priority value in data import. * CC-16533 Updated condition. Co-authored-by: Andrii Pushkar <zingeon1@gmail.com> Co-authored-by: andrew-pushkar <andrew-pushkar@bitbucket.com> Co-authored-by: Roman Havrylko <70894038+romanhavrylko@users.noreply.github.com> * create deploy.spryker-b2csec.yml * APPS:3960 adjust twig templates for AOP (#1111) * APPS:2344:2345 adjusted twig templates * APPS:2344:2345 adjusted twig templates * APPS:3960 adjusted twig templates * APPS:3960 adjusted twig templates * [APPS-2942] ACP Oauth usage integration. * [APPS-2942] Security fix. Co-authored-by: Eugene Chernyi <eugene.chernyi@spryker.com> Co-authored-by: iddqd388 <34138521+iddqd388@users.noreply.github.com> Co-authored-by: Roman Havrylko <roman.havrylko@spryker.com> Co-authored-by: Jeremy Fourna <jeremyfourna@hey.com> Co-authored-by: Andrii Pushkar <zingeon1@gmail.com> Co-authored-by: andrew-pushkar <andrew-pushkar@bitbucket.com> Co-authored-by: Roman Havrylko <70894038+romanhavrylko@users.noreply.github.com> Co-authored-by: Stanislav Russu <stanislavrussu@Stanislav-Russu.local> Co-authored-by: Oleksandr Kiiashko <80702205+oleksander-kiiashko@users.noreply.github.com> Co-authored-by: Anton Zubariev <anton.zubariev@spryker.com> Co-authored-by: Anton Smarovydlo <anton.smarovydlo@spryker.com> * Updated composer. * Sync locked versions. * Updated composer (#1118) * Updated composer hash. * Fixed merchant portal deployment. * Bugticket integrations (#1122) * CC-16655: Integrated P&S fixes. * CC-16655: Integrated P&S fixes. * CC-16659: Integrated issue. * CC-16661: Integrated issue. * CC-16666: Integrated issue. * Updated composer.lock * Updated composer.lock * Removed locked versions. * Rised the composer module versions to the latest. * Fixed composer. * Fixed merge issues. * Rised composer versions. * Updated features. * Removed composer.back. * Fixed missing feature update. Co-authored-by: Ihor Herasimenko <81175258+herasimenko1987@users.noreply.github.com> Co-authored-by: Dmitriy Aseev <32021063+dmiseev@users.noreply.github.com> Co-authored-by: Anton Khabiuk <anton.khabiuk@spryker.com> Co-authored-by: Dmitriy Aseev <dmiseev@gmail.com> Co-authored-by: Roman Havrylko <roman.havrylko@spryker.com> Co-authored-by: Svytoslav V <svytoslav.varpikhovsky@spryker.com> Co-authored-by: maslov <dev.maslov.a@gmail.com> Co-authored-by: Eugene Chernyi <eugene.chernyi@spryker.com> Co-authored-by: iddqd388 <34138521+iddqd388@users.noreply.github.com> Co-authored-by: Dmitry Lymarenko <37305577+DmitryLymarenko@users.noreply.github.com> Co-authored-by: Serhii Chepela <serhii.chepela@spryker.com> Co-authored-by: dmytro-sokolovskyi <79465867+dmytro-sokolovskyi@users.noreply.github.com> Co-authored-by: Stanislav Russu <stanislavrussu@macbookpro.local> Co-authored-by: Jeremy Fourna <jeremyfourna@hey.com> Co-authored-by: ilyakubanov <ilya.kubanov@spryker.com> Co-authored-by: Ilya Kubanov <45764294+ilyakubanov@users.noreply.github.com> Co-authored-by: Nikita Peretyatko <peretyatko@logema.org> Co-authored-by: nPeretyatko <95210291+nPeretyatko@users.noreply.github.com> Co-authored-by: Roman Havrylko <70894038+romanhavrylko@users.noreply.github.com> Co-authored-by: Andrii Pushkar <zingeon1@gmail.com> Co-authored-by: andrew-pushkar <andrew-pushkar@bitbucket.com> Co-authored-by: Yuriy Gerton <yuriy.gerton@spryker.com> Co-authored-by: Sergey Samoylov <sergey.samoylov@spryker.com> Co-authored-by: Andrey Maslov <37797323+andrew-maslov@users.noreply.github.com> Co-authored-by: Florian Krämer <4996022+floriankraemer@users.noreply.github.com> Co-authored-by: Stanislav Russu <stanislavrussu@Stanislav-Russu.local> Co-authored-by: Dmitriy Krainiy <dmitriy.krainiy@spryker.com> Co-authored-by: Artem Stromets <astromets@gmail.com> Co-authored-by: v.strelchenko <v.strelchenko@gamingtec.com> Co-authored-by: Aleksandr Myrnyi <oleksandr.myrnyi@spryker.com> Co-authored-by: Dmitry Lymarenko <dmitry.lymarenko@spryker.com> Co-authored-by: Alexander Kovtun <97117772+KoalaAlexanderKovtun@users.noreply.github.com> Co-authored-by: Eugenia Poidenko <eugenia.poidenko@gmail.com> Co-authored-by: Ilya Antipov <antipov.i-dev@adict.ru> Co-authored-by: danil.moroz <danil.moroz@spryker.com> Co-authored-by: Oleksandr Kiiashko <80702205+oleksander-kiiashko@users.noreply.github.com> Co-authored-by: Volodymyr Bezuhlyi <volodymyr.bezuhlyi@spryker.com> Co-authored-by: Anton Zubariev <anton.zubariev@spryker.com>
- Loading branch information
39 people
committed
Apr 29, 2022
1 parent
7ef06ac
commit fef7c7a