Skip to content

Commit

Permalink
feat: CXSPA-7626 / Service order checkout (#19032)
Browse files Browse the repository at this point in the history 
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Radhep Sabapathipillai <[email protected]>
  • Loading branch information
@anjana-bl @github-actions @RadhepS
3 people authored Jul 15, 2024
1 parent 34b9cc4 commit 5ecc9b1
Show file tree
Hide file tree
Showing 152 changed files with 5,857 additions and 7 deletions.
5 changes: 5 additions & 0 deletions .env-cmdrc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,5 +81,10 @@
"opps":{
"CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-s5-public.model-t.myhybris.cloud",
"CX_OPPS": "true"
},
"s4-service":{
"CX_BASE_URL": "https://api.cg79x9wuu9-eccommerc1-s8-public.model-t.myhybris.cloud",
"CX_S4_SERVICE": "true",
"CX_B2B": "true"
}
}
13 changes: 13 additions & 0 deletions core-libs/setup/tsconfig.spec.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -577,6 +577,19 @@
],
"@spartacus/opps": ["../../integration-libs/opps/public_api"],
"@spartacus/opps/root": ["../../integration-libs/opps/root/public_api"],
"@spartacus/s4-service/assets": [
"../../integration-libs/s4-service/assets/public_api"
],
"@spartacus/s4-service/checkout": [
"../../integration-libs/s4-service/checkout/public_api"
],
"@spartacus/s4-service": ["../../integration-libs/s4-service/public_api"],
"@spartacus/s4-service/order": [
"../../integration-libs/s4-service/order/public_api"
],
"@spartacus/s4-service/root": [
"../../integration-libs/s4-service/root/public_api"
],
"@spartacus/s4om/assets": [
"../../integration-libs/s4om/assets/public_api"
],
Expand Down
1 change: 1 addition & 0 deletions extra-webpack.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ module.exports = {
'feature-libs/pickup-in-store'
),
'@spartacus/s4om': path.join(__dirname, 'integration-libs/s4om'),
'@spartacus/s4-service': path.join(__dirname, 'integration-libs/s4-service'),
},
},
};
13 changes: 13 additions & 0 deletions feature-libs/asm/tsconfig.schematics.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -574,6 +574,19 @@
],
"@spartacus/opps": ["../../integration-libs/opps/public_api"],
"@spartacus/opps/root": ["../../integration-libs/opps/root/public_api"],
"@spartacus/s4-service/assets": [
"../../integration-libs/s4-service/assets/public_api"
],
"@spartacus/s4-service/checkout": [
"../../integration-libs/s4-service/checkout/public_api"
],
"@spartacus/s4-service": ["../../integration-libs/s4-service/public_api"],
"@spartacus/s4-service/order": [
"../../integration-libs/s4-service/order/public_api"
],
"@spartacus/s4-service/root": [
"../../integration-libs/s4-service/root/public_api"
],
"@spartacus/s4om/assets": [
"../../integration-libs/s4om/assets/public_api"
],
Expand Down
13 changes: 13 additions & 0 deletions feature-libs/cart/tsconfig.schematics.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -584,6 +584,19 @@
],
"@spartacus/opps": ["../../integration-libs/opps/public_api"],
"@spartacus/opps/root": ["../../integration-libs/opps/root/public_api"],
"@spartacus/s4-service/assets": [
"../../integration-libs/s4-service/assets/public_api"
],
"@spartacus/s4-service/checkout": [
"../../integration-libs/s4-service/checkout/public_api"
],
"@spartacus/s4-service": ["../../integration-libs/s4-service/public_api"],
"@spartacus/s4-service/order": [
"../../integration-libs/s4-service/order/public_api"
],
"@spartacus/s4-service/root": [
"../../integration-libs/s4-service/root/public_api"
],
"@spartacus/s4om/assets": [
"../../integration-libs/s4om/assets/public_api"
],
Expand Down
13 changes: 13 additions & 0 deletions feature-libs/checkout/tsconfig.schematics.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -584,6 +584,19 @@
],
"@spartacus/opps": ["../../integration-libs/opps/public_api"],
"@spartacus/opps/root": ["../../integration-libs/opps/root/public_api"],
"@spartacus/s4-service/assets": [
"../../integration-libs/s4-service/assets/public_api"
],
"@spartacus/s4-service/checkout": [
"../../integration-libs/s4-service/checkout/public_api"
],
"@spartacus/s4-service": ["../../integration-libs/s4-service/public_api"],
"@spartacus/s4-service/order": [
"../../integration-libs/s4-service/order/public_api"
],
"@spartacus/s4-service/root": [
"../../integration-libs/s4-service/root/public_api"
],
"@spartacus/s4om/assets": [
"../../integration-libs/s4om/assets/public_api"
],
Expand Down
13 changes: 13 additions & 0 deletions feature-libs/customer-ticketing/tsconfig.schematics.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -597,6 +597,19 @@
],
"@spartacus/opps": ["../../integration-libs/opps/public_api"],
"@spartacus/opps/root": ["../../integration-libs/opps/root/public_api"],
"@spartacus/s4-service/assets": [
"../../integration-libs/s4-service/assets/public_api"
],
"@spartacus/s4-service/checkout": [
"../../integration-libs/s4-service/checkout/public_api"
],
"@spartacus/s4-service": ["../../integration-libs/s4-service/public_api"],
"@spartacus/s4-service/order": [
"../../integration-libs/s4-service/order/public_api"
],
"@spartacus/s4-service/root": [
"../../integration-libs/s4-service/root/public_api"
],
"@spartacus/s4om/assets": [
"../../integration-libs/s4om/assets/public_api"
],
Expand Down
13 changes: 13 additions & 0 deletions feature-libs/estimated-delivery-date/tsconfig.schematics.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -597,6 +597,19 @@
],
"@spartacus/opps": ["../../integration-libs/opps/public_api"],
"@spartacus/opps/root": ["../../integration-libs/opps/root/public_api"],
"@spartacus/s4-service/assets": [
"../../integration-libs/s4-service/assets/public_api"
],
"@spartacus/s4-service/checkout": [
"../../integration-libs/s4-service/checkout/public_api"
],
"@spartacus/s4-service": ["../../integration-libs/s4-service/public_api"],
"@spartacus/s4-service/order": [
"../../integration-libs/s4-service/order/public_api"
],
"@spartacus/s4-service/root": [
"../../integration-libs/s4-service/root/public_api"
],
"@spartacus/s4om/assets": [
"../../integration-libs/s4om/assets/public_api"
],
Expand Down
6 changes: 6 additions & 0 deletions feature-libs/order/components/order-details/order-overview/order-overview.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,12 @@
[content]="getDeliveryModeCardContent(order?.deliveryMode) | async"
></cx-card>
</ng-container>

<ng-template
[cxOutlet]="orderOutlets.SERVICE_DETAILS"
[cxOutletContext]="{ item: order, readonly: true }"
>
</ng-template>
</div>

<ng-container *ngIf="order.paymentInfo">
Expand Down
3 changes: 2 additions & 1 deletion feature-libs/order/components/order-details/order-overview/order-overview.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { Card, CmsComponentData } from '@spartacus/storefront';
import { Observable, combineLatest, of } from 'rxjs';
import { filter, map } from 'rxjs/operators';
import { OrderDetailsService } from '../order-details.service';
import { paymentMethodCard } from '@spartacus/order/root';
import { OrderOutlets, paymentMethodCard } from '@spartacus/order/root';

@Component({
selector: 'cx-order-overview',
Expand All @@ -26,6 +26,7 @@ import { paymentMethodCard } from '@spartacus/order/root';
})
export class OrderOverviewComponent {
readonly cartOutlets = CartOutlets;
readonly orderOutlets = OrderOutlets;

order$: Observable<any> = this.orderDetailsService.getOrderDetails();
isOrderLoading$: Observable<boolean> =
Expand Down
1 change: 1 addition & 0 deletions feature-libs/order/root/model/order-outlets.model.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,5 @@
export enum OrderOutlets {
ORDER_CONSIGNMENT = 'cx-order-consignment',
CONSIGNMENT_DELIVERY_INFO = 'cx-order-consignment-delivery-info',
SERVICE_DETAILS = 'cx-service-details-card',
}
13 changes: 13 additions & 0 deletions feature-libs/order/tsconfig.schematics.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -584,6 +584,19 @@
],
"@spartacus/opps": ["../../integration-libs/opps/public_api"],
"@spartacus/opps/root": ["../../integration-libs/opps/root/public_api"],
"@spartacus/s4-service/assets": [
"../../integration-libs/s4-service/assets/public_api"
],
"@spartacus/s4-service/checkout": [
"../../integration-libs/s4-service/checkout/public_api"
],
"@spartacus/s4-service": ["../../integration-libs/s4-service/public_api"],
"@spartacus/s4-service/order": [
"../../integration-libs/s4-service/order/public_api"
],
"@spartacus/s4-service/root": [
"../../integration-libs/s4-service/root/public_api"
],
"@spartacus/s4om/assets": [
"../../integration-libs/s4om/assets/public_api"
],
Expand Down
13 changes: 13 additions & 0 deletions feature-libs/organization/tsconfig.schematics.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -584,6 +584,19 @@
],
"@spartacus/opps": ["../../integration-libs/opps/public_api"],
"@spartacus/opps/root": ["../../integration-libs/opps/root/public_api"],
"@spartacus/s4-service/assets": [
"../../integration-libs/s4-service/assets/public_api"
],
"@spartacus/s4-service/checkout": [
"../../integration-libs/s4-service/checkout/public_api"
],
"@spartacus/s4-service": ["../../integration-libs/s4-service/public_api"],
"@spartacus/s4-service/order": [
"../../integration-libs/s4-service/order/public_api"
],
"@spartacus/s4-service/root": [
"../../integration-libs/s4-service/root/public_api"
],
"@spartacus/s4om/assets": [
"../../integration-libs/s4om/assets/public_api"
],
Expand Down
13 changes: 13 additions & 0 deletions feature-libs/pdf-invoices/tsconfig.schematics.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -597,6 +597,19 @@
],
"@spartacus/opps": ["../../integration-libs/opps/public_api"],
"@spartacus/opps/root": ["../../integration-libs/opps/root/public_api"],
"@spartacus/s4-service/assets": [
"../../integration-libs/s4-service/assets/public_api"
],
"@spartacus/s4-service/checkout": [
"../../integration-libs/s4-service/checkout/public_api"
],
"@spartacus/s4-service": ["../../integration-libs/s4-service/public_api"],
"@spartacus/s4-service/order": [
"../../integration-libs/s4-service/order/public_api"
],
"@spartacus/s4-service/root": [
"../../integration-libs/s4-service/root/public_api"
],
"@spartacus/s4om/assets": [
"../../integration-libs/s4om/assets/public_api"
],
Expand Down
13 changes: 13 additions & 0 deletions feature-libs/pickup-in-store/tsconfig.schematics.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -600,6 +600,19 @@
],
"@spartacus/opps": ["../../integration-libs/opps/public_api"],
"@spartacus/opps/root": ["../../integration-libs/opps/root/public_api"],
"@spartacus/s4-service/assets": [
"../../integration-libs/s4-service/assets/public_api"
],
"@spartacus/s4-service/checkout": [
"../../integration-libs/s4-service/checkout/public_api"
],
"@spartacus/s4-service": ["../../integration-libs/s4-service/public_api"],
"@spartacus/s4-service/order": [
"../../integration-libs/s4-service/order/public_api"
],
"@spartacus/s4-service/root": [
"../../integration-libs/s4-service/root/public_api"
],
"@spartacus/s4om/assets": [
"../../integration-libs/s4om/assets/public_api"
],
Expand Down
13 changes: 13 additions & 0 deletions feature-libs/product-configurator/tsconfig.schematics.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -584,6 +584,19 @@
],
"@spartacus/opps": ["../../integration-libs/opps/public_api"],
"@spartacus/opps/root": ["../../integration-libs/opps/root/public_api"],
"@spartacus/s4-service/assets": [
"../../integration-libs/s4-service/assets/public_api"
],
"@spartacus/s4-service/checkout": [
"../../integration-libs/s4-service/checkout/public_api"
],
"@spartacus/s4-service": ["../../integration-libs/s4-service/public_api"],
"@spartacus/s4-service/order": [
"../../integration-libs/s4-service/order/public_api"
],
"@spartacus/s4-service/root": [
"../../integration-libs/s4-service/root/public_api"
],
"@spartacus/s4om/assets": [
"../../integration-libs/s4om/assets/public_api"
],
Expand Down
13 changes: 13 additions & 0 deletions feature-libs/product/tsconfig.schematics.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -584,6 +584,19 @@
],
"@spartacus/opps": ["../../integration-libs/opps/public_api"],
"@spartacus/opps/root": ["../../integration-libs/opps/root/public_api"],
"@spartacus/s4-service/assets": [
"../../integration-libs/s4-service/assets/public_api"
],
"@spartacus/s4-service/checkout": [
"../../integration-libs/s4-service/checkout/public_api"
],
"@spartacus/s4-service": ["../../integration-libs/s4-service/public_api"],
"@spartacus/s4-service/order": [
"../../integration-libs/s4-service/order/public_api"
],
"@spartacus/s4-service/root": [
"../../integration-libs/s4-service/root/public_api"
],
"@spartacus/s4om/assets": [
"../../integration-libs/s4om/assets/public_api"
],
Expand Down
13 changes: 13 additions & 0 deletions feature-libs/qualtrics/tsconfig.schematics.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -584,6 +584,19 @@
],
"@spartacus/opps": ["../../integration-libs/opps/public_api"],
"@spartacus/opps/root": ["../../integration-libs/opps/root/public_api"],
"@spartacus/s4-service/assets": [
"../../integration-libs/s4-service/assets/public_api"
],
"@spartacus/s4-service/checkout": [
"../../integration-libs/s4-service/checkout/public_api"
],
"@spartacus/s4-service": ["../../integration-libs/s4-service/public_api"],
"@spartacus/s4-service/order": [
"../../integration-libs/s4-service/order/public_api"
],
"@spartacus/s4-service/root": [
"../../integration-libs/s4-service/root/public_api"
],
"@spartacus/s4om/assets": [
"../../integration-libs/s4om/assets/public_api"
],
Expand Down
13 changes: 13 additions & 0 deletions feature-libs/quote/tsconfig.schematics.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -600,6 +600,19 @@
],
"@spartacus/opps": ["../../integration-libs/opps/public_api"],
"@spartacus/opps/root": ["../../integration-libs/opps/root/public_api"],
"@spartacus/s4-service/assets": [
"../../integration-libs/s4-service/assets/public_api"
],
"@spartacus/s4-service/checkout": [
"../../integration-libs/s4-service/checkout/public_api"
],
"@spartacus/s4-service": ["../../integration-libs/s4-service/public_api"],
"@spartacus/s4-service/order": [
"../../integration-libs/s4-service/order/public_api"
],
"@spartacus/s4-service/root": [
"../../integration-libs/s4-service/root/public_api"
],
"@spartacus/s4om/assets": [
"../../integration-libs/s4om/assets/public_api"
],
Expand Down
13 changes: 13 additions & 0 deletions feature-libs/requested-delivery-date/tsconfig.schematics.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -597,6 +597,19 @@
],
"@spartacus/opps": ["../../integration-libs/opps/public_api"],
"@spartacus/opps/root": ["../../integration-libs/opps/root/public_api"],
"@spartacus/s4-service/assets": [
"../../integration-libs/s4-service/assets/public_api"
],
"@spartacus/s4-service/checkout": [
"../../integration-libs/s4-service/checkout/public_api"
],
"@spartacus/s4-service": ["../../integration-libs/s4-service/public_api"],
"@spartacus/s4-service/order": [
"../../integration-libs/s4-service/order/public_api"
],
"@spartacus/s4-service/root": [
"../../integration-libs/s4-service/root/public_api"
],
"@spartacus/s4om/assets": [
"../../integration-libs/s4om/assets/public_api"
],
Expand Down
13 changes: 13 additions & 0 deletions feature-libs/smartedit/tsconfig.schematics.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -584,6 +584,19 @@
],
"@spartacus/opps": ["../../integration-libs/opps/public_api"],
"@spartacus/opps/root": ["../../integration-libs/opps/root/public_api"],
"@spartacus/s4-service/assets": [
"../../integration-libs/s4-service/assets/public_api"
],
"@spartacus/s4-service/checkout": [
"../../integration-libs/s4-service/checkout/public_api"
],
"@spartacus/s4-service": ["../../integration-libs/s4-service/public_api"],
"@spartacus/s4-service/order": [
"../../integration-libs/s4-service/order/public_api"
],
"@spartacus/s4-service/root": [
"../../integration-libs/s4-service/root/public_api"
],
"@spartacus/s4om/assets": [
"../../integration-libs/s4om/assets/public_api"
],
Expand Down
13 changes: 13 additions & 0 deletions feature-libs/storefinder/tsconfig.schematics.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -584,6 +584,19 @@
],
"@spartacus/opps": ["../../integration-libs/opps/public_api"],
"@spartacus/opps/root": ["../../integration-libs/opps/root/public_api"],
"@spartacus/s4-service/assets": [
"../../integration-libs/s4-service/assets/public_api"
],
"@spartacus/s4-service/checkout": [
"../../integration-libs/s4-service/checkout/public_api"
],
"@spartacus/s4-service": ["../../integration-libs/s4-service/public_api"],
"@spartacus/s4-service/order": [
"../../integration-libs/s4-service/order/public_api"
],
"@spartacus/s4-service/root": [
"../../integration-libs/s4-service/root/public_api"
],
"@spartacus/s4om/assets": [
"../../integration-libs/s4om/assets/public_api"
],
Expand Down
Loading

0 comments on commit 5ecc9b1

Please sign in to comment.