Commit b775d8ca authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

Merge branch '42-implement-product-ordering' into 'develop'

implement product ordering

See merge request !38
parents 14a817b1 0d1e3837
Loading
Loading
Loading
Loading
Loading
+8 −0
Original line number Original line Diff line number Diff line
@@ -15,6 +15,9 @@ import { EditIndividualsComponent } from './shared/components/partyManagement/ed
import { ListProductOfferingsComponent } from './p_product/admin/productCatalogManagement/list-product-offerings/list-product-offerings.component';
import { ListProductOfferingsComponent } from './p_product/admin/productCatalogManagement/list-product-offerings/list-product-offerings.component';
import { EditProductCatalogsComponent } from './p_product/admin/productCatalogManagement/edit-product-catalogs/edit-product-catalogs.component';
import { EditProductCatalogsComponent } from './p_product/admin/productCatalogManagement/edit-product-catalogs/edit-product-catalogs.component';
import { EditProductOfferingsComponent } from './p_product/admin/productCatalogManagement/edit-product-offerings/edit-product-offerings.component';
import { EditProductOfferingsComponent } from './p_product/admin/productCatalogManagement/edit-product-offerings/edit-product-offerings.component';
import { ProductOrderCheckoutComponent } from './p_product/orderCheckout/product-order-checkout/product-order-checkout.component';
import { PreviewProductOrderComponent } from './p_product/admin/productOrderManagement/preview-product-order/preview-product-order.component';
import { ListProductOrdersComponent } from './p_product/admin/productOrderManagement/list-product-orders/list-product-orders.component';


const routes: Routes = [
const routes: Routes = [


@@ -29,6 +32,11 @@ const routes: Routes = [
    { path: 'product_category_update/:id', component: EditProductCategoriesComponent },
    { path: 'product_category_update/:id', component: EditProductCategoriesComponent },
    { path: 'product_category_update', component: EditProductCategoriesComponent },
    { path: 'product_category_update', component: EditProductCategoriesComponent },


    { path: 'product_orders', component: ListProductOrdersComponent },
    { path: 'product_order/:id', component: PreviewProductOrderComponent },

    { path: 'product_order_checkout', component: ProductOrderCheckoutComponent },

    { path: 'product_offerings', component: ListProductOfferingsComponent },
    { path: 'product_offerings', component: ListProductOfferingsComponent },
    { path: 'product_offering_update/:id', component: EditProductOfferingsComponent },
    { path: 'product_offering_update/:id', component: EditProductOfferingsComponent },
    { path: 'product_offering_update', component: EditProductOfferingsComponent },
    { path: 'product_offering_update', component: EditProductOfferingsComponent },
+23 −5
Original line number Original line Diff line number Diff line
@@ -25,6 +25,15 @@ import { AssignProductOfferingsComponent } from './p_product/admin/productCatalo
import { AssignSubcategoriesComponent } from './p_product/admin/productCatalogManagement/edit-product-categories/assign-subcategories/assign-subcategories.component';
import { AssignSubcategoriesComponent } from './p_product/admin/productCatalogManagement/edit-product-categories/assign-subcategories/assign-subcategories.component';
import { ConfirmCharacteristicAssignmentComponent } from './p_product/admin/productCatalogManagement/edit-product-specs/assign-service-specification/confirm-characteristic-assignment/confirm-characteristic-assignment.component';
import { ConfirmCharacteristicAssignmentComponent } from './p_product/admin/productCatalogManagement/edit-product-specs/assign-service-specification/confirm-characteristic-assignment/confirm-characteristic-assignment.component';
import { SortByValuePipe } from './p_product/admin/productCatalogManagement/edit-product-offerings/sort-by-value.pipe';
import { SortByValuePipe } from './p_product/admin/productCatalogManagement/edit-product-offerings/sort-by-value.pipe';
import { ProductOrderCheckoutComponent } from './p_product/orderCheckout/product-order-checkout/product-order-checkout.component';
import { ProductOrderCalendarComponent } from './p_product/admin/productOrderManagement/product-order-calendar/product-order-calendar.component';
import { ListProductOrdersComponent } from './p_product/admin/productOrderManagement/list-product-orders/list-product-orders.component';
import { PreviewProductOrderComponent } from './p_product/admin/productOrderManagement/preview-product-order/preview-product-order.component';
import { EditProductOrderItemsComponent } from './p_product/admin/productOrderManagement/preview-product-order/edit-product-order-items/edit-product-order-items.component';
import { TerminateProductOrderItemsComponent } from './p_product/admin/productOrderManagement/preview-product-order/terminate-product-order-items/terminate-product-order-items.component';
import { DeleteProductOrderComponent } from './p_product/admin/productOrderManagement/delete-product-order/delete-product-order.component';
import { EditOrdersProductSpecCharacteristicsComponent } from './p_product/admin/productOrderManagement/preview-product-order/edit-product-order-items/edit-orders-product-spec-characteristics/edit-orders-product-spec-characteristics.component';
import { FullCalendarModule } from "@fullcalendar/angular";


@NgModule({
@NgModule({
    declarations: [
    declarations: [
@@ -49,12 +58,21 @@ import { SortByValuePipe } from './p_product/admin/productCatalogManagement/edit
        PreviewMarketPlaceItemComponent,
        PreviewMarketPlaceItemComponent,
        AssignProductOfferingsComponent,
        AssignProductOfferingsComponent,
        AssignSubcategoriesComponent,
        AssignSubcategoriesComponent,
        SortByValuePipe
        SortByValuePipe,
        ProductOrderCheckoutComponent,
        ProductOrderCalendarComponent,
        PreviewProductOrderComponent,
        EditProductOrderItemsComponent,
        TerminateProductOrderItemsComponent,
        DeleteProductOrderComponent,
        ListProductOrdersComponent,
        EditOrdersProductSpecCharacteristicsComponent
    ],
    ],
    imports: [
    imports: [
    CommonModule,
    CommonModule,
    SharedModule,
    SharedModule,
    AppProductsRoutingModule,
    AppProductsRoutingModule,
    FullCalendarModule
]
]
})
})


+22 −0
Original line number Original line Diff line number Diff line
/* tslint:disable */
/* eslint-disable */
/* Code generated by ng-openapi-gen DO NOT EDIT. */

import { Injectable } from '@angular/core';

/**
 * Global configuration
 */
@Injectable({
  providedIn: 'root',
})
export class ApiConfiguration {
  rootUrl: string = 'https://portal.openslice.eu/tmf-api';
}

/**
 * Parameters for `ApiModule.forRoot()`
 */
export interface ApiConfigurationParams {
  rootUrl?: string;
}
+58 −0
Original line number Original line Diff line number Diff line
/* tslint:disable */
/* eslint-disable */
/* Code generated by ng-openapi-gen DO NOT EDIT. */

import { NgModule, ModuleWithProviders, SkipSelf, Optional } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { ApiConfiguration, ApiConfigurationParams } from './api-configuration';

import { ProductOrderService } from './services/product-order.service';
import { ListenerService } from './services/listener.service';
import { NotificationListenersClientSideService } from './services/notification-listeners-client-side.service';
import { HubService } from './services/hub.service';
import { EventsSubscriptionService } from './services/events-subscription.service';
import { CancelProductOrderService } from './services/cancel-product-order.service';

/**
 * Module that provides all services and configuration.
 */
@NgModule({
  imports: [],
  exports: [],
  declarations: [],
  providers: [
    ProductOrderService,
    ListenerService,
    NotificationListenersClientSideService,
    HubService,
    EventsSubscriptionService,
    CancelProductOrderService,
    ApiConfiguration
  ],
})
export class ApiModule {
  static forRoot(params: ApiConfigurationParams): ModuleWithProviders<ApiModule> {
    return {
      ngModule: ApiModule,
      providers: [
        {
          provide: ApiConfiguration,
          useValue: params
        }
      ]
    }
  }

  constructor( 
    @Optional() @SkipSelf() parentModule: ApiModule,
    @Optional() http: HttpClient
  ) {
    if (parentModule) {
      throw new Error('ApiModule is already loaded. Import in your base AppModule only.');
    }
    if (!http) {
      throw new Error('You need to import the HttpClientModule in your AppModule! \n' +
      'See also https://github.com/angular/angular/issues/20575');
    }
  }
}
+36 −0
Original line number Original line Diff line number Diff line
/* tslint:disable */
/* eslint-disable */
/* Code generated by ng-openapi-gen DO NOT EDIT. */

import { Injectable } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { ApiConfiguration } from './api-configuration';

/**
 * Base class for services
 */
@Injectable()
export class BaseService {
  constructor(
    protected config: ApiConfiguration,
    protected http: HttpClient
  ) {
  }

  private _rootUrl?: string;

  /**
   * Returns the root url for all operations in this service. If not set directly in this
   * service, will fallback to `ApiConfiguration.rootUrl`.
   */
  get rootUrl(): string {
    return this._rootUrl || this.config.rootUrl;
  }

  /**
   * Sets the root URL for API operations in this service.
   */
  set rootUrl(rootUrl: string) {
    this._rootUrl = rootUrl;
  }
}
Loading