Merge pull request #2266 from dpfaffenbauer/wishlist

[WishlistBundle] make wishlist easier usable outside of CoreShop
coreshop · May 3, 2023 · ca4aa4d · ca4aa4d
2 parents 7a6d012 + a7a274f
commit ca4aa4d
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 86 deletions.
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -84,6 +84,7 @@ services:
  - db
  volumes:
  - .:/var/www/html:cached
+ - ./.docker/xdebug-config.ini:/usr/local/etc/php/conf.d/21-xdebug.ini
  environment:
  PHP_IDE_CONFIG: serverName=localhost
  XDEBUG_TRIGGER: PHPSTORM
@@ -110,6 +111,7 @@ services:
  - db
  volumes:
  - .:/var/www/html:cached
+ - ./.docker/xdebug-config.ini:/usr/local/etc/php/conf.d/21-xdebug.ini
  environment:
  PHP_IDE_CONFIG: serverName=localhost
  COMPOSER_HOME: /var/www/html

diff --git a/src/CoreShop/Bundle/CoreBundle/Pimcore/Repository/WishlistRepository.php b/src/CoreShop/Bundle/CoreBundle/Pimcore/Repository/WishlistRepository.php
@@ -22,8 +22,8 @@
 use CoreShop\Component\Customer\Model\CustomerInterface;
 use CoreShop\Component\Store\Model\StoreInterface;
 use CoreShop\Component\Wishlist\Model\WishlistInterface;
-
-class WishlistRepository extends \CoreShop\Bundle\WishlistBundle\Pimcore\Repository\WishlistRepository implements WishlistRepositoryInterface
+use CoreShop\Bundle\WishlistBundle\Pimcore\Repository\WishlistRepository as BaseWishlistRepository;
+class WishlistRepository extends BaseWishlistRepository implements WishlistRepositoryInterface
 {
  public function findLatestByStoreAndCustomer(
  StoreInterface $store,

diff --git a/src/CoreShop/Bundle/ResourceBundle/DependencyInjection/CoreShopResourceExtension.php b/src/CoreShop/Bundle/ResourceBundle/DependencyInjection/CoreShopResourceExtension.php
@@ -76,6 +76,7 @@ public function load(array $configs, ContainerBuilder $container): void
  'priority' => 10,
  ]);
 
+ $container->setParameter('coreshop.resources', []);
  $container->setDefinition('coreshop.body_listener', $bodyListener);
 
  $container

diff --git a/src/CoreShop/Bundle/WishlistBundle/Pimcore/Repository/WishlistRepository.php b/src/CoreShop/Bundle/WishlistBundle/Pimcore/Repository/WishlistRepository.php
@@ -18,6 +18,7 @@
 
 namespace CoreShop\Bundle\WishlistBundle\Pimcore\Repository;
 
+use Carbon\Carbon;
 use CoreShop\Bundle\ResourceBundle\Pimcore\PimcoreRepository;
 use CoreShop\Component\StorageList\Model\StorageListInterface;
 use CoreShop\Component\Wishlist\Model\WishlistInterface;

diff --git a/src/CoreShop/Bundle/WishlistBundle/Resources/install/pimcore/classes/CoreShopWishlist.json b/src/CoreShop/Bundle/WishlistBundle/Resources/install/pimcore/classes/CoreShopWishlist.json
@@ -42,31 +42,6 @@
  "datatype": "layout",
  "permissions": null,
  "children": [
- {
- "fieldtype": "input",
- "width": "",
- "defaultValue": null,
- "columnLength": 190,
- "regex": "",
- "regexFlags": [],
- "unique": false,
- "showCharCount": false,
- "name": "name",
- "title": "Name",
- "tooltip": "",
- "mandatory": false,
- "noteditable": false,
- "index": false,
- "locked": false,
- "style": "",
- "permissions": null,
- "datatype": "data",
- "relationType": false,
- "invisible": false,
- "visibleGridView": false,
- "visibleSearch": false,
- "defaultValueGenerator": ""
- },
  {
  "fieldtype": "input",
  "width": null,
@@ -92,27 +67,9 @@
  "visibleSearch": false,
  "defaultValueGenerator": ""
  },
- {
- "fieldtype": "coreShopStore",
- "allowEmpty": false,
- "name": "store",
- "title": "coreshop.order.store",
- "tooltip": "",
- "mandatory": false,
- "noteditable": true,
- "index": false,
- "locked": false,
- "style": "",
- "permissions": null,
- "datatype": "data",
- "relationType": false,
- "invisible": false,
- "visibleGridView": false,
- "visibleSearch": false
- },
  {
  "fieldtype": "coreShopRelations",
- "stack": "coreshop.product",
+ "stack": "coreshop.wishlist_item",
  "relationType": true,
  "objectsAllowed": true,
  "assetsAllowed": false,
@@ -139,38 +96,6 @@
  "invisible": false,
  "visibleGridView": false,
  "visibleSearch": false
- },
- {
- "fieldtype": "coreShopRelation",
- "stack": "coreshop.customer",
- "relationType": true,
- "objectsAllowed": true,
- "assetsAllowed": false,
- "documentsAllowed": false,
- "returnConcrete": false,
- "width": null,
- "assetUploadPath": null,
- "assetTypes": [],
- "documentTypes": [],
- "classes": [
- {
- "classes": "CoreShopCustomer"
- }
- ],
- "pathFormatterClass": "",
- "name": "customer",
- "title": "Customer",
- "tooltip": "",
- "mandatory": false,
- "noteditable": false,
- "index": false,
- "locked": false,
- "style": "",
- "permissions": null,
- "datatype": "data",
- "invisible": false,
- "visibleGridView": false,
- "visibleSearch": false
  }
  ],
  "locked": false,

diff --git a/...oreShop/Bundle/WishlistBundle/Resources/install/pimcore/classes/CoreShopWishlistItem.json b/...oreShop/Bundle/WishlistBundle/Resources/install/pimcore/classes/CoreShopWishlistItem.json
@@ -55,9 +55,6 @@
  "assetTypes": [],
  "documentTypes": [],
  "classes": [
- {
- "classes": "CoreShopProduct"
- }
  ],
  "pathFormatterClass": "",
  "name": "product",
@@ -119,11 +116,6 @@
  "invisible": false,
  "visibleGridView": false,
  "visibleSearch": false,
- "classes": [
- {
- "classes": "CoreShopWishlist"
- }
- ],
  "pathFormatterClass": "",
  "width": null,
  "assetUploadPath": null,