Skip to content

feat: add css style files to schematics #20275

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

Open
wants to merge 62 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
93d3065
first generate punchout lib
FollowTheFlo Jan 24, 2025
173c2af
second commit
FollowTheFlo Jan 24, 2025
971df98
add schematics
FollowTheFlo Jan 24, 2025
8e1e598
punchout fix build
FollowTheFlo Jan 27, 2025
375332f
add root and routing
FollowTheFlo Jan 28, 2025
9936130
add connectors
FollowTheFlo Feb 8, 2025
3599494
renamed cpnt
FollowTheFlo Feb 18, 2025
dd1e3ed
Add license header
github-actions[bot] Feb 18, 2025
05b33ce
add interceptor and build fix
FollowTheFlo Feb 19, 2025
ca18c29
Merge branch 'feature/CXSPA-8589' of https://github.com/SAP/spartacus…
FollowTheFlo Feb 19, 2025
7f043be
Add license header
github-actions[bot] Feb 19, 2025
fc71349
add product routing
FollowTheFlo Feb 20, 2025
e2ee0d6
Merge branch 'feature/CXSPA-8589' of https://github.com/SAP/spartacus…
FollowTheFlo Feb 20, 2025
5747d1b
add requisition cpnt
FollowTheFlo Feb 25, 2025
c5ab92f
Add license header
github-actions[bot] Feb 25, 2025
a095572
remove logs
FollowTheFlo Feb 25, 2025
b0b1f45
use of reactive form
FollowTheFlo Feb 26, 2025
29cbe79
Merge branch 'feature/CXSPA-8589' of https://github.com/SAP/spartacus…
FollowTheFlo Feb 26, 2025
a16fe17
exclude punchout pages from SSR
FollowTheFlo Feb 28, 2025
1c7c89a
clean address bar url
FollowTheFlo Feb 28, 2025
0f0657f
Merge branch 'develop' into feature/CXSPA-8589
FollowTheFlo Feb 28, 2025
c389444
fix build errors
FollowTheFlo Feb 28, 2025
9f7ce8c
punchout env setup
FollowTheFlo Feb 28, 2025
176b680
remove logic to keep squeleton
FollowTheFlo Feb 28, 2025
f7e3635
prettier fix
FollowTheFlo Mar 3, 2025
fe5f0a4
add schematics test files
FollowTheFlo Mar 3, 2025
ac4c74e
add schematics tests
FollowTheFlo Mar 3, 2025
0506b7c
deps and tests
FollowTheFlo Mar 3, 2025
d6dff47
OCC Punchout Session & Requisition endpoints (#20043)
FollowTheFlo Mar 5, 2025
f919b21
new test env
FollowTheFlo Mar 7, 2025
7bc1f4b
Punchout login (#20058)
FollowTheFlo Mar 13, 2025
153cc5f
Merge branch 'develop' into epic/punchout
FollowTheFlo Mar 13, 2025
8e39582
Login when initial token is invalid (#20081)
FollowTheFlo Mar 14, 2025
ea5dc1a
Add data persistence (#20093)
FollowTheFlo Mar 20, 2025
ef894e3
Refresh punchout session when auth token is invalid (#20105)
FollowTheFlo Mar 21, 2025
d3840fb
Keep storage cleaned when Punchout is unused (#20108)
FollowTheFlo Mar 24, 2025
1fd862f
Add Cart Loading feature (#20109)
FollowTheFlo Mar 25, 2025
4648697
Add Requisition Submission feature (#20125)
FollowTheFlo Mar 27, 2025
777e5e4
Merge branch 'develop' into epic/punchout
FollowTheFlo Mar 27, 2025
44dd0ae
bump version from merge
FollowTheFlo Mar 27, 2025
409c7c3
Add Punchout lib schematics (#20134)
FollowTheFlo Apr 1, 2025
04c4647
Punchout Cancel Requisition feature (#20141)
FollowTheFlo Apr 3, 2025
b29f730
feat: Punchout Close Session button (#20155)
FollowTheFlo Apr 10, 2025
ffc6146
reduce test coverage as to be added later (CXSPA-9965)
FollowTheFlo Apr 24, 2025
4c3b192
feat: add Punchout Inspect Cart feature (#20226)
FollowTheFlo Apr 28, 2025
1ae2d26
feat: navigation restriction with guard using occ request (#20184)
FollowTheFlo Apr 29, 2025
3c59c07
feat: Punchout: modify non-CMS UI elements POC2 (#20256)
Pucek9 May 2, 2025
664d00f
feat: Land on Login page when error (#20255)
FollowTheFlo May 5, 2025
a053dcf
add style files
FollowTheFlo May 5, 2025
54968dc
fix: navigation guard when page refreshed (#20265)
FollowTheFlo May 5, 2025
27ead4c
Merge branch 'epic/punchout' into feature/CXSPA-10011
FollowTheFlo May 6, 2025
dbd76e1
Merge branch 'develop' into epic/punchout
FollowTheFlo May 6, 2025
e32bfae
feat: added missing unit tests for punchout components (#20270)
kimhw0630 May 6, 2025
b718573
fix: Punchout build throws circular dependency error (#20273)
Pucek9 May 7, 2025
5053c42
update deps and packages version
FollowTheFlo May 7, 2025
7c74626
Merge branch 'epic/punchout' into feature/CXSPA-10011
FollowTheFlo May 7, 2025
c4840be
Merge branch 'develop' of github.com:SAP/spartacus into epic/punchout
Pucek9 May 7, 2025
32abbf6
epic/punchout: prettier fixes
Pucek9 May 7, 2025
3861713
epic/punchout: prettier fix windows
Pucek9 May 7, 2025
5954d55
epic/punchout: prettier fix windows
Pucek9 May 7, 2025
c0b2e55
chore: Improve Punchout Level logic (#20274)
Pucek9 May 7, 2025
8c0a536
Merge branch 'epic/punchout' into feature/CXSPA-10011
FollowTheFlo May 7, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .env-cmdrc
Original file line number Diff line number Diff line change
Expand Up @@ -94,5 +94,10 @@
"CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-s8-public.model-t.myhybris.cloud",
"CX_S4_SERVICE": "true",
"CX_B2B": "true"
},
"punchout": {
"CX_BASE_URL": "https://api.c432wmya2v-teamspart3-s2-public.model-t.myhybris.cloud",
"CX_PUNCHOUT": "true",
"CX_B2B": "true"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ export interface RenderingStrategyResolverOptions {

export const defaultRenderingStrategyResolverOptions: RenderingStrategyResolverOptions =
{
excludedUrls: ['checkout', 'my-account'],
excludedUrls: ['checkout', 'my-account', 'punchout'],
excludedParams: ['asm'],
};
16 changes: 16 additions & 0 deletions core-libs/setup/tsconfig.spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -696,6 +696,22 @@
],
"@spartacus/opps": ["../../integration-libs/opps/public_api"],
"@spartacus/opps/root": ["../../integration-libs/opps/root/public_api"],
"@spartacus/punchout/assets": [
"../../integration-libs/punchout/assets/public_api"
],
"@spartacus/punchout/components": [
"../../integration-libs/punchout/components/public_api"
],
"@spartacus/punchout/core": [
"../../integration-libs/punchout/core/public_api"
],
"@spartacus/punchout": ["../../integration-libs/punchout/public_api"],
"@spartacus/punchout/occ": [
"../../integration-libs/punchout/occ/public_api"
],
"@spartacus/punchout/root": [
"../../integration-libs/punchout/root/public_api"
],
"@spartacus/s4-service/assets": [
"../../integration-libs/s4-service/assets/public_api"
],
Expand Down
13 changes: 10 additions & 3 deletions extra-webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,10 @@ module.exports = {
__dirname,
'feature-libs/product-configurator'
),
'@spartacus/product-multi-dimensional': path.join(__dirname, 'feature-libs/product-multi-dimensional'),
'@spartacus/product-multi-dimensional': path.join(
__dirname,
'feature-libs/product-multi-dimensional'
),
'@spartacus/storefinder': path.join(
__dirname,
'feature-libs/storefinder'
Expand All @@ -58,7 +61,7 @@ module.exports = {
'@spartacus/tracking': path.join(__dirname, 'feature-libs/tracking'),
'@spartacus/cart': path.join(__dirname, 'feature-libs/cart'),
'@spartacus/order': path.join(__dirname, 'feature-libs/order'),
'@spartacus/quote': path.join( __dirname, 'feature-libs/quote'),
'@spartacus/quote': path.join(__dirname, 'feature-libs/quote'),
'@spartacus/epd-visualization': path.join(
__dirname,
'integration-libs/epd-visualization'
Expand All @@ -73,8 +76,12 @@ module.exports = {
),
'@spartacus/s4om': path.join(__dirname, 'integration-libs/s4om'),
'@spartacus/opf': path.join(__dirname, 'integration-libs/opf'),
'@spartacus/s4-service': path.join(__dirname, 'integration-libs/s4-service'),
'@spartacus/s4-service': path.join(
__dirname,
'integration-libs/s4-service'
),
'@spartacus/omf': path.join(__dirname, 'integration-libs/omf'),
'@spartacus/punchout': path.join(__dirname, 'integration-libs/punchout'),
},
},
};
16 changes: 16 additions & 0 deletions feature-libs/asm/tsconfig.schematics.json
Original file line number Diff line number Diff line change
Expand Up @@ -693,6 +693,22 @@
],
"@spartacus/opps": ["../../integration-libs/opps/public_api"],
"@spartacus/opps/root": ["../../integration-libs/opps/root/public_api"],
"@spartacus/punchout/assets": [
"../../integration-libs/punchout/assets/public_api"
],
"@spartacus/punchout/components": [
"../../integration-libs/punchout/components/public_api"
],
"@spartacus/punchout/core": [
"../../integration-libs/punchout/core/public_api"
],
"@spartacus/punchout": ["../../integration-libs/punchout/public_api"],
"@spartacus/punchout/occ": [
"../../integration-libs/punchout/occ/public_api"
],
"@spartacus/punchout/root": [
"../../integration-libs/punchout/root/public_api"
],
"@spartacus/s4-service/assets": [
"../../integration-libs/s4-service/assets/public_api"
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<div class="cx-table-item-container">
<!-- Item Image -->
<a
*ngIf="!options.disableItemLink"
[routerLink]="{ cxRoute: 'product', params: item.product } | cxUrl"
tabindex="0"
>
Expand All @@ -18,14 +19,21 @@
format="cartIcon"
></cx-media>
</a>
<cx-media
*ngIf="options.disableItemLink"
[container]="item.product?.images?.PRIMARY"
format="cartIcon"
></cx-media>
<div class="cx-info">
<div *ngIf="item.product?.name" class="cx-name">
<a
*ngIf="!options.disableItemLink"
[attr.id]="item.product?.code + '_header'"
class="cx-link"
[routerLink]="{ cxRoute: 'product', params: item.product } | cxUrl"
>{{ item.product?.name }}</a
>
<span *ngIf="options.disableItemLink">{{ item.product?.name }}</span>
</div>
<div *ngIf="item.product?.code" class="cx-code">
{{ 'cartItems.id' | cxTranslate }} {{ item.product?.code }}
Expand Down
1 change: 1 addition & 0 deletions feature-libs/cart/base/root/models/cart.model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ export interface CartItemComponentOptions {
displayAddToCart?: boolean;
addToCartString?: string;
cartType?: CartType;
disableItemLink?: boolean;
}
/**
* A key that identifies an 'abstract order', that in OO terms can be understood
Expand Down
16 changes: 16 additions & 0 deletions feature-libs/cart/tsconfig.schematics.json
Original file line number Diff line number Diff line change
Expand Up @@ -693,6 +693,22 @@
],
"@spartacus/opps": ["../../integration-libs/opps/public_api"],
"@spartacus/opps/root": ["../../integration-libs/opps/root/public_api"],
"@spartacus/punchout/assets": [
"../../integration-libs/punchout/assets/public_api"
],
"@spartacus/punchout/components": [
"../../integration-libs/punchout/components/public_api"
],
"@spartacus/punchout/core": [
"../../integration-libs/punchout/core/public_api"
],
"@spartacus/punchout": ["../../integration-libs/punchout/public_api"],
"@spartacus/punchout/occ": [
"../../integration-libs/punchout/occ/public_api"
],
"@spartacus/punchout/root": [
"../../integration-libs/punchout/root/public_api"
],
"@spartacus/s4-service/assets": [
"../../integration-libs/s4-service/assets/public_api"
],
Expand Down
16 changes: 16 additions & 0 deletions feature-libs/checkout/tsconfig.schematics.json
Original file line number Diff line number Diff line change
Expand Up @@ -693,6 +693,22 @@
],
"@spartacus/opps": ["../../integration-libs/opps/public_api"],
"@spartacus/opps/root": ["../../integration-libs/opps/root/public_api"],
"@spartacus/punchout/assets": [
"../../integration-libs/punchout/assets/public_api"
],
"@spartacus/punchout/components": [
"../../integration-libs/punchout/components/public_api"
],
"@spartacus/punchout/core": [
"../../integration-libs/punchout/core/public_api"
],
"@spartacus/punchout": ["../../integration-libs/punchout/public_api"],
"@spartacus/punchout/occ": [
"../../integration-libs/punchout/occ/public_api"
],
"@spartacus/punchout/root": [
"../../integration-libs/punchout/root/public_api"
],
"@spartacus/s4-service/assets": [
"../../integration-libs/s4-service/assets/public_api"
],
Expand Down
16 changes: 16 additions & 0 deletions feature-libs/customer-ticketing/tsconfig.schematics.json
Original file line number Diff line number Diff line change
Expand Up @@ -706,6 +706,22 @@
],
"@spartacus/opps": ["../../integration-libs/opps/public_api"],
"@spartacus/opps/root": ["../../integration-libs/opps/root/public_api"],
"@spartacus/punchout/assets": [
"../../integration-libs/punchout/assets/public_api"
],
"@spartacus/punchout/components": [
"../../integration-libs/punchout/components/public_api"
],
"@spartacus/punchout/core": [
"../../integration-libs/punchout/core/public_api"
],
"@spartacus/punchout": ["../../integration-libs/punchout/public_api"],
"@spartacus/punchout/occ": [
"../../integration-libs/punchout/occ/public_api"
],
"@spartacus/punchout/root": [
"../../integration-libs/punchout/root/public_api"
],
"@spartacus/s4-service/assets": [
"../../integration-libs/s4-service/assets/public_api"
],
Expand Down
16 changes: 16 additions & 0 deletions feature-libs/estimated-delivery-date/tsconfig.schematics.json
Original file line number Diff line number Diff line change
Expand Up @@ -706,6 +706,22 @@
],
"@spartacus/opps": ["../../integration-libs/opps/public_api"],
"@spartacus/opps/root": ["../../integration-libs/opps/root/public_api"],
"@spartacus/punchout/assets": [
"../../integration-libs/punchout/assets/public_api"
],
"@spartacus/punchout/components": [
"../../integration-libs/punchout/components/public_api"
],
"@spartacus/punchout/core": [
"../../integration-libs/punchout/core/public_api"
],
"@spartacus/punchout": ["../../integration-libs/punchout/public_api"],
"@spartacus/punchout/occ": [
"../../integration-libs/punchout/occ/public_api"
],
"@spartacus/punchout/root": [
"../../integration-libs/punchout/root/public_api"
],
"@spartacus/s4-service/assets": [
"../../integration-libs/s4-service/assets/public_api"
],
Expand Down
16 changes: 16 additions & 0 deletions feature-libs/order/tsconfig.schematics.json
Original file line number Diff line number Diff line change
Expand Up @@ -693,6 +693,22 @@
],
"@spartacus/opps": ["../../integration-libs/opps/public_api"],
"@spartacus/opps/root": ["../../integration-libs/opps/root/public_api"],
"@spartacus/punchout/assets": [
"../../integration-libs/punchout/assets/public_api"
],
"@spartacus/punchout/components": [
"../../integration-libs/punchout/components/public_api"
],
"@spartacus/punchout/core": [
"../../integration-libs/punchout/core/public_api"
],
"@spartacus/punchout": ["../../integration-libs/punchout/public_api"],
"@spartacus/punchout/occ": [
"../../integration-libs/punchout/occ/public_api"
],
"@spartacus/punchout/root": [
"../../integration-libs/punchout/root/public_api"
],
"@spartacus/s4-service/assets": [
"../../integration-libs/s4-service/assets/public_api"
],
Expand Down
16 changes: 16 additions & 0 deletions feature-libs/organization/tsconfig.schematics.json
Original file line number Diff line number Diff line change
Expand Up @@ -693,6 +693,22 @@
],
"@spartacus/opps": ["../../integration-libs/opps/public_api"],
"@spartacus/opps/root": ["../../integration-libs/opps/root/public_api"],
"@spartacus/punchout/assets": [
"../../integration-libs/punchout/assets/public_api"
],
"@spartacus/punchout/components": [
"../../integration-libs/punchout/components/public_api"
],
"@spartacus/punchout/core": [
"../../integration-libs/punchout/core/public_api"
],
"@spartacus/punchout": ["../../integration-libs/punchout/public_api"],
"@spartacus/punchout/occ": [
"../../integration-libs/punchout/occ/public_api"
],
"@spartacus/punchout/root": [
"../../integration-libs/punchout/root/public_api"
],
"@spartacus/s4-service/assets": [
"../../integration-libs/s4-service/assets/public_api"
],
Expand Down
16 changes: 16 additions & 0 deletions feature-libs/pdf-invoices/tsconfig.schematics.json
Original file line number Diff line number Diff line change
Expand Up @@ -706,6 +706,22 @@
],
"@spartacus/opps": ["../../integration-libs/opps/public_api"],
"@spartacus/opps/root": ["../../integration-libs/opps/root/public_api"],
"@spartacus/punchout/assets": [
"../../integration-libs/punchout/assets/public_api"
],
"@spartacus/punchout/components": [
"../../integration-libs/punchout/components/public_api"
],
"@spartacus/punchout/core": [
"../../integration-libs/punchout/core/public_api"
],
"@spartacus/punchout": ["../../integration-libs/punchout/public_api"],
"@spartacus/punchout/occ": [
"../../integration-libs/punchout/occ/public_api"
],
"@spartacus/punchout/root": [
"../../integration-libs/punchout/root/public_api"
],
"@spartacus/s4-service/assets": [
"../../integration-libs/s4-service/assets/public_api"
],
Expand Down
16 changes: 16 additions & 0 deletions feature-libs/pickup-in-store/tsconfig.schematics.json
Original file line number Diff line number Diff line change
Expand Up @@ -708,6 +708,22 @@
],
"@spartacus/opps": ["../../integration-libs/opps/public_api"],
"@spartacus/opps/root": ["../../integration-libs/opps/root/public_api"],
"@spartacus/punchout/assets": [
"../../integration-libs/punchout/assets/public_api"
],
"@spartacus/punchout/components": [
"../../integration-libs/punchout/components/public_api"
],
"@spartacus/punchout/core": [
"../../integration-libs/punchout/core/public_api"
],
"@spartacus/punchout": ["../../integration-libs/punchout/public_api"],
"@spartacus/punchout/occ": [
"../../integration-libs/punchout/occ/public_api"
],
"@spartacus/punchout/root": [
"../../integration-libs/punchout/root/public_api"
],
"@spartacus/s4-service/assets": [
"../../integration-libs/s4-service/assets/public_api"
],
Expand Down
16 changes: 16 additions & 0 deletions feature-libs/product-configurator/tsconfig.schematics.json
Original file line number Diff line number Diff line change
Expand Up @@ -693,6 +693,22 @@
],
"@spartacus/opps": ["../../integration-libs/opps/public_api"],
"@spartacus/opps/root": ["../../integration-libs/opps/root/public_api"],
"@spartacus/punchout/assets": [
"../../integration-libs/punchout/assets/public_api"
],
"@spartacus/punchout/components": [
"../../integration-libs/punchout/components/public_api"
],
"@spartacus/punchout/core": [
"../../integration-libs/punchout/core/public_api"
],
"@spartacus/punchout": ["../../integration-libs/punchout/public_api"],
"@spartacus/punchout/occ": [
"../../integration-libs/punchout/occ/public_api"
],
"@spartacus/punchout/root": [
"../../integration-libs/punchout/root/public_api"
],
"@spartacus/s4-service/assets": [
"../../integration-libs/s4-service/assets/public_api"
],
Expand Down
16 changes: 16 additions & 0 deletions feature-libs/product-multi-dimensional/tsconfig.schematics.json
Original file line number Diff line number Diff line change
Expand Up @@ -693,6 +693,22 @@
],
"@spartacus/opps": ["../../integration-libs/opps/public_api"],
"@spartacus/opps/root": ["../../integration-libs/opps/root/public_api"],
"@spartacus/punchout/assets": [
"../../integration-libs/punchout/assets/public_api"
],
"@spartacus/punchout/components": [
"../../integration-libs/punchout/components/public_api"
],
"@spartacus/punchout/core": [
"../../integration-libs/punchout/core/public_api"
],
"@spartacus/punchout": ["../../integration-libs/punchout/public_api"],
"@spartacus/punchout/occ": [
"../../integration-libs/punchout/occ/public_api"
],
"@spartacus/punchout/root": [
"../../integration-libs/punchout/root/public_api"
],
"@spartacus/s4-service/assets": [
"../../integration-libs/s4-service/assets/public_api"
],
Expand Down
16 changes: 16 additions & 0 deletions feature-libs/product/tsconfig.schematics.json
Original file line number Diff line number Diff line change
Expand Up @@ -693,6 +693,22 @@
],
"@spartacus/opps": ["../../integration-libs/opps/public_api"],
"@spartacus/opps/root": ["../../integration-libs/opps/root/public_api"],
"@spartacus/punchout/assets": [
"../../integration-libs/punchout/assets/public_api"
],
"@spartacus/punchout/components": [
"../../integration-libs/punchout/components/public_api"
],
"@spartacus/punchout/core": [
"../../integration-libs/punchout/core/public_api"
],
"@spartacus/punchout": ["../../integration-libs/punchout/public_api"],
"@spartacus/punchout/occ": [
"../../integration-libs/punchout/occ/public_api"
],
"@spartacus/punchout/root": [
"../../integration-libs/punchout/root/public_api"
],
"@spartacus/s4-service/assets": [
"../../integration-libs/s4-service/assets/public_api"
],
Expand Down
Loading
Loading