Merge remote-tracking branch 'recipes-dev/master'

ibexa · Jan 24, 2024 · 54db650 · 54db650
2 parents 6fb7e63 + c601a78
commit 54db650
Show file tree

Hide file tree

Showing 55 changed files with 531 additions and 616 deletions.
diff --git a/ibexa/activity-log/4.6/manifest.json b/ibexa/activity-log/4.6/manifest.json
@@ -0,0 +1,4 @@
+{
+  "aliases": [],
+  "bundles": {}
+}
diff --git a/ibexa/cdp/4.6/config/packages/ibexa_cdp.yaml b/ibexa/cdp/4.6/config/packages/ibexa_cdp.yaml
@@ -15,6 +15,11 @@
 #                        stream_file:
 #                            # Use Stream ID generated during data import from "stream file" in Data Manager
 #                            stream_id: 00000000-00000000-00000000-00000000
+#                    product_data:
+#                        transport: stream_file
+#                        stream_file:
+#                            # Use Stream ID generated during data import from "stream file" in Data Manager
+#                            stream_id: 00000000-00000000-00000000-00000000
 #
 #                # You can configure multiple activations here. They have to be of type "Ibexa" in Ibexa DXP dashboard.
 #                activations:
@@ -24,3 +29,45 @@
 #                        client_secret: '%env(CDP_ACTIVATION_CLIENT_SECRET)%'
 #                        # Segment Group where CDP data will be imported to
 #                        segment_group_identifier: example_segment_group_identifier
+#
+#ibexa_cdp:
+#    data_export:
+#        schedule:
+#            user:
+#                # You can use examples below to build your own data export schedule.
+#                # Accepted options can be listed by running `php bin/console ibexa:cdp:stream-user-data --help`
+##                # every 15 minutes
+##                -
+##                    interval: '*/15 * * * *'
+##                    options: '--stream-id=00000000-00000000-00000000-00000000 --user-content-type=user --no-draft'
+##
+##                # every 6 hours
+##                -
+##                    interval: '0 */6 * * *'
+##                    options: '--stream-id=00000000-00000000-00000000-00000000 --user-content-type=user --no-draft'
+#
+#            content:
+#                # You can use examples below to build your own data export schedule.
+#                # Accepted options can be listed by running `php bin/console ibexa:cdp:stream-content-data --help`
+##                # every 30 minutes
+##                -
+##                    interval: '*/30 * * * *'
+##                    options: '--stream-id=00000000-00000000-00000000-00000000 --content-type=article --no-draft'
+##
+##                # every 12 hours
+##                -
+##                    interval: '0 */12 * * *'
+##                    options: '--stream-id=00000000-00000000-00000000-00000000 --content-type=article --no-draft'
+#
+#            product:
+#            # You can use examples below to build your own data export schedule.
+#            # Accepted options can be listed by running `php bin/console ibexa:cdp:stream-product-data --help`
+##                # every 30 minutes
+##                -
+##                    interval: '*/30 * * * *'
+##                    options: '--stream-id=00000000-00000000-00000000-00000000 --product-type=laptop --no-draft'
+##
+##                # every 12 hours
+##                -
+##                    interval: '0 */12 * * *'
+##                    options: '--stream-id=00000000-00000000-00000000-00000000 --product-type=laptop --no-draft'
diff --git a/ibexa/commerce/4.6/assets/images/commerce.png b/ibexa/commerce/4.6/assets/images/commerce.png
diff --git a/ibexa/commerce/4.6/assets/images/commerce.svg b/ibexa/commerce/4.6/assets/images/commerce.svg
diff --git a/ibexa/commerce/4.6/assets/scss/_header.scss b/ibexa/commerce/4.6/assets/scss/_header.scss
@@ -35,6 +35,7 @@
     }
 
     .ibexa-welcome-img {
+        flex: initial;
         margin-top: 150px;
         margin-right: -300px;
     }
@@ -48,6 +49,7 @@
     .ibexa-welcome-header {
         .ibexa-welcome-img {
             width: 100%;
+            margin-top: 190px;
             margin-right: 0;
         }
     }

diff --git a/ibexa/commerce/4.6/config/packages/ibexa_admin_ui.yaml b/ibexa/commerce/4.6/config/packages/ibexa_admin_ui.yaml
@@ -27,6 +27,7 @@ ibexa:
                     - 55 # Forms
                     - 56 # Site skeletons
                     - 60 # Components
+                    - 67 # Dashboards
             subtree_paths:
                 content: /1/2/
                 media: /1/43/
@@ -71,5 +72,11 @@ ibexa:
                     thumbnail: '/bundles/ibexaicons/img/all-icons.svg#landing_page'
                 default-config:
                     thumbnail: '/bundles/ibexaicons/img/all-icons.svg#file'
-            user_content_type_identifier: ['user', 'customer', 'member']
+            user_content_type_identifier: ['user', 'customer', 'member', 'editor']
+            user_profile:
+                enabled: true
+                content_types: ['editor']
+                field_groups: ['about', 'contact']
             default_page: 'dashboard'
+            content:
+                default_ttl: 0
diff --git a/ibexa/commerce/4.6/config/packages/ibexa_site_context.yaml b/ibexa/commerce/4.6/config/packages/ibexa_site_context.yaml
@@ -0,0 +1,13 @@
+ibexa:
+    system:
+        admin_group:
+            site_context:
+                excluded_paths:
+                    - /1/5/     # Users
+                    - /1/43/    # Media
+                    - /1/55/    # Forms
+                    - /1/56/    # Site skeletons
+                    - /1/67/    # Dashboards
+                    - /1/61/    # Product categorises
+                    - /1/65/    # Corporate Account
+                    - /1/57/    # Tags
diff --git a/ibexa/commerce/4.6/config/packages/payum.yaml b/ibexa/commerce/4.6/config/packages/payum.yaml
@@ -0,0 +1,9 @@
+payum:
+    storages:
+        Ibexa\Payment\Values\Payment:
+            custom: Ibexa\ConnectorPayum\Storage\Payment
+
+    security:
+        token_storage:
+            Ibexa\ConnectorPayum\Token\PaymentToken:
+                doctrine: orm
diff --git a/ibexa/commerce/4.6/config/routes/ibexa_activity_log.yaml b/ibexa/commerce/4.6/config/routes/ibexa_activity_log.yaml
@@ -0,0 +1,6 @@
+ibexa.activity_log:
+    resource: '@IbexaActivityLogBundle/Resources/config/routing.yaml'
+
+ibexa.activity_log.rest:
+    resource: '@IbexaActivityLogBundle/Resources/config/routing/rest.yaml'
+    prefix: '%ibexa.rest.path_prefix%'
diff --git a/ibexa/commerce/4.6/config/routes/ibexa_dashboard.yaml b/ibexa/commerce/4.6/config/routes/ibexa_dashboard.yaml
@@ -0,0 +1,2 @@
+ibexa.dashboard:
+    resource: '@IbexaDashboardBundle/Resources/config/routing/admin.yaml'
diff --git a/ibexa/commerce/4.6/config/routes/ibexa_site_context.yaml b/ibexa/commerce/4.6/config/routes/ibexa_site_context.yaml
@@ -0,0 +1,4 @@
+ibexa.site_context.admin:
+  resource: '@IbexaSiteContextBundle/Resources/config/routing_admin.yaml'
+  defaults:
+    siteaccess_group_whitelist: '%admin_group_name%'
diff --git a/ibexa/commerce/4.6/config/routes/payum.yaml b/ibexa/commerce/4.6/config/routes/payum.yaml
@@ -0,0 +1,2 @@
+payum_all:
+    resource: "@PayumBundle/Resources/config/routing/all.xml"
diff --git a/ibexa/commerce/4.6/encore/package.json b/ibexa/commerce/4.6/encore/package.json
@@ -15,12 +15,13 @@
     "raw-loader": "^4.0.1",
     "style-loader": "^2.0.0",
     "file-loader": "^6.0.0",
-    "@ckeditor/ckeditor5-alignment": "^36.0.1",
-    "@ckeditor/ckeditor5-build-inline": "^36.0.1",
-    "@ckeditor/ckeditor5-dev-utils": "^32.0.0",
-    "@ckeditor/ckeditor5-widget": "^36.0.1",
-    "@ckeditor/ckeditor5-theme-lark": "^36.0.1",
-    "@ckeditor/ckeditor5-code-block": "^36.0.1"
+    "@ckeditor/ckeditor5-alignment": "^40.1.0",
+    "@ckeditor/ckeditor5-build-inline": "^40.1.0",
+    "@ckeditor/ckeditor5-dev-utils": "^39.0.0",
+    "@ckeditor/ckeditor5-widget": "^40.1.0",
+    "@ckeditor/ckeditor5-theme-lark": "^40.1.0",
+    "@ckeditor/ckeditor5-code-block": "^40.1.0",
+    "@svgr/webpack": "^8.1.0"
   },
   "dependencies": {
     "react": "^18.2.0",

diff --git a/ibexa/commerce/4.6/manifest.json b/ibexa/commerce/4.6/manifest.json
@@ -54,6 +54,7 @@
     "Ibexa\\Bundle\\Search\\IbexaSearchBundle": ["all"],
     "Ibexa\\Bundle\\Icons\\IbexaIconsBundle": ["all"],
     "Ibexa\\Bundle\\Installer\\IbexaInstallerBundle": ["all"],
+    "Ibexa\\Bundle\\Notifications\\IbexaNotificationsBundle": ["all"],
     "Overblog\\GraphQLBundle\\OverblogGraphQLBundle": ["all"],
     "Overblog\\GraphiQLBundle\\OverblogGraphiQLBundle": ["dev"],
     "Twig\\Extra\\TwigExtraBundle\\TwigExtraBundle": ["all"],
@@ -80,7 +81,14 @@
     "Ibexa\\Bundle\\Storefront\\IbexaStorefrontBundle": ["all"],
     "Ibexa\\Bundle\\OrderManagement\\IbexaOrderManagementBundle": ["all"],
     "Ibexa\\Bundle\\Payment\\IbexaPaymentBundle": ["all"],
-    "Ibexa\\Bundle\\Shipping\\IbexaShippingBundle": ["all"]
+    "Ibexa\\Bundle\\Shipping\\IbexaShippingBundle": ["all"],
+    "Ibexa\\Bundle\\CorporateAccountCommerceBridge\\IbexaCorporateAccountCommerceBridgeBundle": ["all"],
+    "Payum\\Bundle\\PayumBundle\\PayumBundle": ["all"],
+    "Ibexa\\Bundle\\ConnectorPayum\\IbexaConnectorPayumBundle": ["all"],
+    "Ibexa\\Bundle\\ActivityLog\\IbexaActivityLogBundle": ["all"],
+    "Ibexa\\Bundle\\ImagePicker\\IbexaImagePickerBundle": ["all"],
+    "Ibexa\\Bundle\\Dashboard\\IbexaDashboardBundle": ["all"],
+    "Ibexa\\Bundle\\SiteContext\\IbexaSiteContextBundle": ["all"]
   },
   "copy-from-recipe": {
     "config/": "%CONFIG_DIR%/",

diff --git a/ibexa/commerce/4.6/templates/themes/standard/full/welcome_page.html.twig b/ibexa/commerce/4.6/templates/themes/standard/full/welcome_page.html.twig
@@ -68,7 +68,7 @@
                 <div class="ibexa-welcome-column ibexa-welcome-header__img-column">
                     <img
                         class="ibexa-welcome-img ibexa-welcome-img--center"
-                        src="{{ asset('build/images/commerce.svg') }}"
+                        src="{{ asset('build/images/commerce.png') }}"
                         alt="{{ 'ibexa_platform_welcome_page.header.image'|trans|desc('Commerce') }}"
                     />
                 </div>

diff --git a/ibexa/connector-actito/4.6/config/packages/ibexa_connector_actito.yaml b/ibexa/connector-actito/4.6/config/packages/ibexa_connector_actito.yaml
@@ -0,0 +1,29 @@
+## Use following example to set up your e-mail campaigns
+#ibexa:
+#    system:
+#        default:
+#            connector_actito:
+#                api_key: '%env(ACTITO_API_KEY)%'
+#                entity: my_entity_name
+#                campaign_mapping:
+#                    #
+#                    # This map configures which campaigns are triggered in
+#                    # Actito system when particular Notification is emitted
+#                    #
+#                    # Element key is the FQCN of the Notification,
+#                    # "campaign" property has to match campaign name or ID
+#                    #
+#                    Ibexa\Contracts\OrderManagement\Notification\OrderStatusChange:
+#                        campaign: example_campaign_name_order_status_change
+#
+#                    Ibexa\Contracts\Payment\Notification\PaymentStatusChange:
+#                        campaign: example_campaign_name_payment_status_change
+#
+#                    Ibexa\Contracts\Shipping\Notification\ShipmentStatusChange:
+#                        campaign: example_campaign_name_shipment_status_change
+#
+#                    Ibexa\Contracts\User\Notification\UserPasswordReset:
+#                        campaign: example_campaign_name_user_password_reset
+#
+#                    Ibexa\Contracts\User\Notification\UserRegister:
+#                        campaign: example_campaign_name_user_register
diff --git a/ibexa/connector-actito/4.6/manifest.json b/ibexa/connector-actito/4.6/manifest.json
@@ -0,0 +1,13 @@
+{
+  "aliases": ["ibexa-connector-actito", "actito"],
+  "bundles": {
+    "Ibexa\\Bundle\\ConnectorActito\\IbexaConnectorActitoBundle": ["all"]
+  },
+  "env": {
+    "#1": "Ask your IT/Admin to create API User in Actito Dashboard and put generated API Key here",
+    "ACTITO_API_KEY": "1234567890"
+  },
+  "copy-from-recipe": {
+    "config/": "%CONFIG_DIR%/"
+  }
+}
diff --git a/ibexa/connector-payum/4.6/manifest.json b/ibexa/connector-payum/4.6/manifest.json
@@ -0,0 +1,4 @@
+{
+  "aliases": [],
+  "bundles": {}
+}
diff --git a/ibexa/corporate-account-commerce-bridge/4.6/manifest.json b/ibexa/corporate-account-commerce-bridge/4.6/manifest.json
@@ -0,0 +1,4 @@
+{
+  "aliases": [],
+  "bundles": {}
+}
diff --git a/ibexa/dashboard/4.6/manifest.json b/ibexa/dashboard/4.6/manifest.json
@@ -0,0 +1,4 @@
+{
+  "aliases": [],
+  "bundles": {}
+}
diff --git a/ibexa/experience/4.6/assets/images/experience.png b/ibexa/experience/4.6/assets/images/experience.png