Merge conflicts

SAP · Sep 15, 2023 · 080842e · 080842e
2 parents e8c81be + 30e51f8
commit 080842e
Show file tree

Hide file tree

Showing 165 changed files with 7,184 additions and 762 deletions.
diff --git a/.env-cmdrc b/.env-cmdrc
@@ -49,10 +49,15 @@
     "CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-s8-public.model-t.myhybris.cloud",
     "CX_B2B": "true",
     "CX_S4OM": "true",
-    "CX_REQUESTED_DELIVERY_DATE": "true"
+    "CX_REQUESTED_DELIVERY_DATE": "true",
+    "CX_PDF_INVOICES": "true"
   },
   "requested-delivery-date": {
     "CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-s8-public.model-t.myhybris.cloud",
     "CX_REQUESTED_DELIVERY_DATE": "true"
+  },
+  "pdf-invoices": {
+    "CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-s5-public.model-t.myhybris.cloud",
+    "CX_PDF_INVOICES": "true"
   }
 }
diff --git a/core-libs/setup/package.json b/core-libs/setup/package.json
@@ -16,17 +16,17 @@
     "test": "../../node_modules/.bin/jest --config ./jest.config.js"
   },
   "dependencies": {
-    "tslib": "^2.4.0"
+    "tslib": "^2.6.2"
   },
   "peerDependencies": {
-    "@angular/core": "^15.2.4",
+    "@angular/core": "^15.2.9",
     "@spartacus/cart": "6.3.0-1",
     "@spartacus/core": "6.3.0-1",
     "@spartacus/order": "6.3.0-1",
     "@spartacus/user": "6.3.0-1"
   },
   "optionalDependencies": {
-    "@angular/platform-server": "^15.2.4",
+    "@angular/platform-server": "^15.2.9",
     "@nguniversal/express-engine": "^15.2.0",
     "express": "^4.18.2"
   },

diff --git a/core-libs/setup/tsconfig.spec.json b/core-libs/setup/tsconfig.spec.json
@@ -262,6 +262,22 @@
       "@spartacus/organization/user-registration/root": [
         "../../feature-libs/organization/user-registration/root/public_api"
       ],
+      "@spartacus/pdf-invoices/assets": [
+        "../../feature-libs/pdf-invoices/assets/public_api"
+      ],
+      "@spartacus/pdf-invoices/components": [
+        "../../feature-libs/pdf-invoices/components/public_api"
+      ],
+      "@spartacus/pdf-invoices/core": [
+        "../../feature-libs/pdf-invoices/core/public_api"
+      ],
+      "@spartacus/pdf-invoices": ["../../feature-libs/pdf-invoices/public_api"],
+      "@spartacus/pdf-invoices/occ": [
+        "../../feature-libs/pdf-invoices/occ/public_api"
+      ],
+      "@spartacus/pdf-invoices/root": [
+        "../../feature-libs/pdf-invoices/root/public_api"
+      ],
       "@spartacus/pickup-in-store/assets": [
         "../../feature-libs/pickup-in-store/assets/public_api"
       ],

diff --git a/extra-webpack.config.js b/extra-webpack.config.js
@@ -29,6 +29,10 @@ module.exports = {
         __dirname,
         'feature-libs/organization'
       ),
+      '@spartacus/pdf-invoices': path.join(
+        __dirname,
+        'feature-libs/pdf-invoices'
+      ),
       '@spartacus/product': path.join(__dirname, 'feature-libs/product'),
       '@spartacus/product-configurator': path.join(
         __dirname,

diff --git a/feature-libs/asm/package.json b/feature-libs/asm/package.json
@@ -22,13 +22,13 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.4.0"
+    "tslib": "^2.6.2"
   },
   "peerDependencies": {
-    "@angular-devkit/schematics": "^15.2.4",
-    "@angular/common": "^15.2.4",
-    "@angular/core": "^15.2.4",
-    "@angular/forms": "^15.2.4",
+    "@angular-devkit/schematics": "^15.2.9",
+    "@angular/common": "^15.2.9",
+    "@angular/core": "^15.2.9",
+    "@angular/forms": "^15.2.9",
     "@ng-select/ng-select": "^10.0.3",
     "@ngrx/effects": "^15.3.0",
     "@ngrx/store": "^15.3.0",

diff --git a/feature-libs/asm/tsconfig.schematics.json b/feature-libs/asm/tsconfig.schematics.json
@@ -259,6 +259,22 @@
       "@spartacus/organization/user-registration/root": [
         "../../feature-libs/organization/user-registration/root/public_api"
       ],
+      "@spartacus/pdf-invoices/assets": [
+        "../../feature-libs/pdf-invoices/assets/public_api"
+      ],
+      "@spartacus/pdf-invoices/components": [
+        "../../feature-libs/pdf-invoices/components/public_api"
+      ],
+      "@spartacus/pdf-invoices/core": [
+        "../../feature-libs/pdf-invoices/core/public_api"
+      ],
+      "@spartacus/pdf-invoices": ["../../feature-libs/pdf-invoices/public_api"],
+      "@spartacus/pdf-invoices/occ": [
+        "../../feature-libs/pdf-invoices/occ/public_api"
+      ],
+      "@spartacus/pdf-invoices/root": [
+        "../../feature-libs/pdf-invoices/root/public_api"
+      ],
       "@spartacus/pickup-in-store/assets": [
         "../../feature-libs/pickup-in-store/assets/public_api"
       ],

diff --git a/feature-libs/cart/package.json b/feature-libs/cart/package.json
@@ -26,14 +26,14 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.4.0"
+    "tslib": "^2.6.2"
   },
   "peerDependencies": {
-    "@angular-devkit/schematics": "^15.2.4",
-    "@angular/common": "^15.2.4",
-    "@angular/core": "^15.2.4",
-    "@angular/forms": "^15.2.4",
-    "@angular/router": "^15.2.4",
+    "@angular-devkit/schematics": "^15.2.9",
+    "@angular/common": "^15.2.9",
+    "@angular/core": "^15.2.9",
+    "@angular/forms": "^15.2.9",
+    "@angular/router": "^15.2.9",
     "@ng-select/ng-select": "^10.0.3",
     "@ngrx/effects": "^15.3.0",
     "@ngrx/store": "^15.3.0",

diff --git a/feature-libs/cart/tsconfig.schematics.json b/feature-libs/cart/tsconfig.schematics.json
@@ -259,6 +259,22 @@
       "@spartacus/organization/user-registration/root": [
         "../../feature-libs/organization/user-registration/root/public_api"
       ],
+      "@spartacus/pdf-invoices/assets": [
+        "../../feature-libs/pdf-invoices/assets/public_api"
+      ],
+      "@spartacus/pdf-invoices/components": [
+        "../../feature-libs/pdf-invoices/components/public_api"
+      ],
+      "@spartacus/pdf-invoices/core": [
+        "../../feature-libs/pdf-invoices/core/public_api"
+      ],
+      "@spartacus/pdf-invoices": ["../../feature-libs/pdf-invoices/public_api"],
+      "@spartacus/pdf-invoices/occ": [
+        "../../feature-libs/pdf-invoices/occ/public_api"
+      ],
+      "@spartacus/pdf-invoices/root": [
+        "../../feature-libs/pdf-invoices/root/public_api"
+      ],
       "@spartacus/pickup-in-store/assets": [
         "../../feature-libs/pickup-in-store/assets/public_api"
       ],

diff --git a/feature-libs/checkout/package.json b/feature-libs/checkout/package.json
@@ -22,14 +22,14 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.4.0"
+    "tslib": "^2.6.2"
   },
   "peerDependencies": {
-    "@angular-devkit/schematics": "^15.2.4",
-    "@angular/common": "^15.2.4",
-    "@angular/core": "^15.2.4",
-    "@angular/forms": "^15.2.4",
-    "@angular/router": "^15.2.4",
+    "@angular-devkit/schematics": "^15.2.9",
+    "@angular/common": "^15.2.9",
+    "@angular/core": "^15.2.9",
+    "@angular/forms": "^15.2.9",
+    "@angular/router": "^15.2.9",
     "@ng-select/ng-select": "^10.0.3",
     "@ngrx/store": "^15.3.0",
     "@spartacus/cart": "6.3.0-1",

diff --git a/feature-libs/checkout/tsconfig.schematics.json b/feature-libs/checkout/tsconfig.schematics.json
@@ -259,6 +259,22 @@
       "@spartacus/organization/user-registration/root": [
         "../../feature-libs/organization/user-registration/root/public_api"
       ],
+      "@spartacus/pdf-invoices/assets": [
+        "../../feature-libs/pdf-invoices/assets/public_api"
+      ],
+      "@spartacus/pdf-invoices/components": [
+        "../../feature-libs/pdf-invoices/components/public_api"
+      ],
+      "@spartacus/pdf-invoices/core": [
+        "../../feature-libs/pdf-invoices/core/public_api"
+      ],
+      "@spartacus/pdf-invoices": ["../../feature-libs/pdf-invoices/public_api"],
+      "@spartacus/pdf-invoices/occ": [
+        "../../feature-libs/pdf-invoices/occ/public_api"
+      ],
+      "@spartacus/pdf-invoices/root": [
+        "../../feature-libs/pdf-invoices/root/public_api"
+      ],
       "@spartacus/pickup-in-store/assets": [
         "../../feature-libs/pickup-in-store/assets/public_api"
       ],

diff --git a/feature-libs/customer-ticketing/package.json b/feature-libs/customer-ticketing/package.json
@@ -22,14 +22,14 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.4.0"
+    "tslib": "^2.6.2"
   },
   "peerDependencies": {
-    "@angular-devkit/schematics": "^15.2.4",
-    "@angular/common": "^15.2.4",
-    "@angular/core": "^15.2.4",
-    "@angular/forms": "^15.2.4",
-    "@angular/router": "^15.2.4",
+    "@angular-devkit/schematics": "^15.2.9",
+    "@angular/common": "^15.2.9",
+    "@angular/core": "^15.2.9",
+    "@angular/forms": "^15.2.9",
+    "@angular/router": "^15.2.9",
     "@spartacus/cart": "6.3.0-1",
     "@spartacus/core": "6.3.0-1",
     "@spartacus/schematics": "6.3.0-1",

diff --git a/feature-libs/customer-ticketing/tsconfig.schematics.json b/feature-libs/customer-ticketing/tsconfig.schematics.json
@@ -272,6 +272,22 @@
       "@spartacus/organization/user-registration/root": [
         "../../feature-libs/organization/user-registration/root/public_api"
       ],
+      "@spartacus/pdf-invoices/assets": [
+        "../../feature-libs/pdf-invoices/assets/public_api"
+      ],
+      "@spartacus/pdf-invoices/components": [
+        "../../feature-libs/pdf-invoices/components/public_api"
+      ],
+      "@spartacus/pdf-invoices/core": [
+        "../../feature-libs/pdf-invoices/core/public_api"
+      ],
+      "@spartacus/pdf-invoices": ["../../feature-libs/pdf-invoices/public_api"],
+      "@spartacus/pdf-invoices/occ": [
+        "../../feature-libs/pdf-invoices/occ/public_api"
+      ],
+      "@spartacus/pdf-invoices/root": [
+        "../../feature-libs/pdf-invoices/root/public_api"
+      ],
       "@spartacus/pickup-in-store/assets": [
         "../../feature-libs/pickup-in-store/assets/public_api"
       ],

diff --git a/feature-libs/order/package.json b/feature-libs/order/package.json
@@ -22,14 +22,14 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.4.0"
+    "tslib": "^2.6.2"
   },
   "peerDependencies": {
-    "@angular-devkit/schematics": "^15.2.4",
-    "@angular/common": "^15.2.4",
-    "@angular/core": "^15.2.4",
-    "@angular/forms": "^15.2.4",
-    "@angular/router": "^15.2.4",
+    "@angular-devkit/schematics": "^15.2.9",
+    "@angular/common": "^15.2.9",
+    "@angular/core": "^15.2.9",
+    "@angular/forms": "^15.2.9",
+    "@angular/router": "^15.2.9",
     "@ng-select/ng-select": "^10.0.3",
     "@ngrx/effects": "^15.3.0",
     "@ngrx/store": "^15.3.0",

diff --git a/feature-libs/order/tsconfig.schematics.json b/feature-libs/order/tsconfig.schematics.json
@@ -259,6 +259,22 @@
       "@spartacus/organization/user-registration/root": [
         "../../feature-libs/organization/user-registration/root/public_api"
       ],
+      "@spartacus/pdf-invoices/assets": [
+        "../../feature-libs/pdf-invoices/assets/public_api"
+      ],
+      "@spartacus/pdf-invoices/components": [
+        "../../feature-libs/pdf-invoices/components/public_api"
+      ],
+      "@spartacus/pdf-invoices/core": [
+        "../../feature-libs/pdf-invoices/core/public_api"
+      ],
+      "@spartacus/pdf-invoices": ["../../feature-libs/pdf-invoices/public_api"],
+      "@spartacus/pdf-invoices/occ": [
+        "../../feature-libs/pdf-invoices/occ/public_api"
+      ],
+      "@spartacus/pdf-invoices/root": [
+        "../../feature-libs/pdf-invoices/root/public_api"
+      ],
       "@spartacus/pickup-in-store/assets": [
         "../../feature-libs/pickup-in-store/assets/public_api"
       ],

diff --git a/feature-libs/organization/package.json b/feature-libs/organization/package.json
@@ -22,14 +22,14 @@
     "test:schematics": "npm --prefix ../../projects/schematics/ run clean && npm run clean:schematics && ../../node_modules/.bin/jest --config ./jest.schematics.config.js"
   },
   "dependencies": {
-    "tslib": "^2.4.0"
+    "tslib": "^2.6.2"
   },
   "peerDependencies": {
-    "@angular-devkit/schematics": "^15.2.4",
-    "@angular/common": "^15.2.4",
-    "@angular/core": "^15.2.4",
-    "@angular/forms": "^15.2.4",
-    "@angular/router": "^15.2.4",
+    "@angular-devkit/schematics": "^15.2.9",
+    "@angular/common": "^15.2.9",
+    "@angular/core": "^15.2.9",
+    "@angular/forms": "^15.2.9",
+    "@angular/router": "^15.2.9",
     "@ng-select/ng-select": "^10.0.3",
     "@ngrx/effects": "^15.3.0",
     "@ngrx/store": "^15.3.0",

diff --git a/feature-libs/organization/tsconfig.schematics.json b/feature-libs/organization/tsconfig.schematics.json
@@ -259,6 +259,22 @@
       "@spartacus/organization/user-registration/root": [
         "../../feature-libs/organization/user-registration/root/public_api"
       ],
+      "@spartacus/pdf-invoices/assets": [
+        "../../feature-libs/pdf-invoices/assets/public_api"
+      ],
+      "@spartacus/pdf-invoices/components": [
+        "../../feature-libs/pdf-invoices/components/public_api"
+      ],
+      "@spartacus/pdf-invoices/core": [
+        "../../feature-libs/pdf-invoices/core/public_api"
+      ],
+      "@spartacus/pdf-invoices": ["../../feature-libs/pdf-invoices/public_api"],
+      "@spartacus/pdf-invoices/occ": [
+        "../../feature-libs/pdf-invoices/occ/public_api"
+      ],
+      "@spartacus/pdf-invoices/root": [
+        "../../feature-libs/pdf-invoices/root/public_api"
+      ],
       "@spartacus/pickup-in-store/assets": [
         "../../feature-libs/pickup-in-store/assets/public_api"
       ],

diff --git a/feature-libs/pdf-invoices/.eslintrc.json b/feature-libs/pdf-invoices/.eslintrc.json
@@ -0,0 +1,4 @@
+{
+  "extends": "../../.eslintrc.json",
+  "ignorePatterns": ["schematics/**/*.d.ts"]
+}
diff --git a/feature-libs/pdf-invoices/README.md b/feature-libs/pdf-invoices/README.md
@@ -0,0 +1,4 @@
+# PDF Invoices
+
+This feature allows users to view invoices for their orders and download PDF invoices using `Invoices` APIs.
+When the user selects an invoice, the backend returns a byte array, which is converted to PDF and downloaded.
diff --git a/feature-libs/pdf-invoices/_index.scss b/feature-libs/pdf-invoices/_index.scss
@@ -0,0 +1,2 @@
+@import '@spartacus/styles/scss/core';
+@import './styles/index';
diff --git a/feature-libs/pdf-invoices/assets/ng-package.json b/feature-libs/pdf-invoices/assets/ng-package.json
@@ -0,0 +1,6 @@
+{
+  "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json",
+  "lib": {
+    "entryFile": "./public_api.ts"
+  }
+}
diff --git a/feature-libs/pdf-invoices/assets/public_api.ts b/feature-libs/pdf-invoices/assets/public_api.ts
@@ -0,0 +1,7 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <[email protected]>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+export * from './translations/translations';
diff --git a/feature-libs/pdf-invoices/assets/translations/en/index.ts b/feature-libs/pdf-invoices/assets/translations/en/index.ts
@@ -0,0 +1,11 @@
+/*
+ * SPDX-FileCopyrightText: 2023 SAP Spartacus team <[email protected]>
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { pdfInvoices } from './pdf-invoices';
+
+export const en = {
+  pdfInvoices,
+};