ngx-render-material-forms 2.2.7 → 2.2.9

package/fesm2020/ngx-render-material-forms.js

@@ -2679,7 +2679,8 @@ class CommonService {
     loadProducts(pageNumber, pazeSize, search = '', onlyActive = true, description = false, levelOneId, levelTwoId, levelThreeId, levelFourId) {
         const baseApiUrl = this.getBaseApiUrl();
         const vendorId = this.getValueByKey(this.paramsData, 'vendorId');
-        return this.http.get(`${baseApiUrl}/api/VendorFormBuilder/GetVendorProductsV2?vendorId=${vendorId}&pageNumber=${pageNumber}&pageSize=${pazeSize}&search=${search}&onlyActive=${onlyActive}&includeDescription=${description}&levelOne=${levelOneId}&levelTwo=${levelTwoId}&levelThree=${levelThreeId}&levelFour=${levelFourId}`);
+        const programId = this.getValueByKey(this.paramsData, 'programId');
+        return this.http.get(`${baseApiUrl}/api/VendorFormBuilder/GetVendorProductsV2?vendorId=${vendorId}&pageNumber=${pageNumber}&pageSize=${pazeSize}&search=${search}&onlyActive=${onlyActive}&includeDescription=${description}&levelOne=${levelOneId}&levelTwo=${levelTwoId}&levelThree=${levelThreeId}&levelFour=${levelFourId}&programId=${programId}`);
     }
     listSubCategory(category) {
         const vendorId = this.getValueByKey(this.paramsData, 'vendorId');
@@ -2885,6 +2886,7 @@ class MaterialSelectComponent extends MaterialComponent {
         const vendorId = this.getValueByKey(paramsData, 'vendorId');
         const onlyActive = this.getValueByKey(paramsData, 'onlyActive');
         const includeCountry = this.getValueByKey(paramsData, 'filterProductBasedOnCustomerCountry');
+        const programId = this.getValueByKey(paramsData, "programId");
         var currentUser = JSON.parse(localStorage.getItem('currentUser'));
         let headers;
         if (currentUser && currentUser.Tokens && currentUser.Tokens.AccessToken) {
@@ -2903,6 +2905,7 @@ class MaterialSelectComponent extends MaterialComponent {
         const ensearchQuery = this.commonService.scrumble(searchQuery);
         const encodeIncludeCountry = this.commonService.scrumble(includeCountry);
         let enactive = this.commonService.scrumble(onlyActive);
+        const enprogramId = this.commonService.scrumble(programId);
         //Check if enactive is undefined, null, or blank
         if (enactive === undefined || enactive === null || enactive === '') {
             enactive = this.commonService.scrumble(true); // Set default value to true
@@ -2922,7 +2925,7 @@ class MaterialSelectComponent extends MaterialComponent {
         // Get the current hostname
         const hostname = window.location.hostname;
         const baseApiUrl = baseUrlMapping[btoa(hostname)] || null;
-        let url = `${baseApiUrl}/api/VendorFormBuilder/GetVendorProducts?vendorId=${envendorId}&pageNumber=${enpageNumber}&pageSize=${enpageSize}&search=${ensearchQuery}&onlyActive=${enactive}&includeDescription=${endescription}`;
+        let url = `${baseApiUrl}/api/VendorFormBuilder/GetVendorProducts?vendorId=${envendorId}&pageNumber=${enpageNumber}&pageSize=${enpageSize}&search=${ensearchQuery}&onlyActive=${enactive}&includeDescription=${endescription}&programId=${enprogramId}`;
         // Only add includeCountryId if it has a valid value
         if (encodeIncludeCountry !== null && encodeIncludeCountry !== undefined && this.isFilterProductBasedOnCustomerCountryValid(this.instance.component.data)) {
             url += `&filterProductBasedOnCustomerCountry=${encodeIncludeCountry}`;
@@ -3507,7 +3510,7 @@ class AddOnProductsComponent {
         this.priceTweek = data.dropdownsFlag?.priceTweek || "Price";
         this.productTweek = data.dropdownsFlag?.productTweek || "Product Name";
         this.quantityTweek = data.dropdownsFlag?.quantityTweek || "Quantity";
-        this.showCost = data.dropdownsFlag.showDialogCost;
+        this.showCost = data.dropdownsFlag?.showDialogCost;
         this.categoryTweek = data.dropdownsFlag?.categoryTweek || "Category Name";
         this.subCategoryTweek = data.dropdownsFlag?.subCategoryTweek || "Sub Category";
         this.inventoryTweek = data.dropdownsFlag?.inventoryTweek || "Inventory";
@@ -3553,7 +3556,7 @@ class AddOnProductsComponent {
                 value: [product?.value || ''],
                 otherInformation0: [product?.otherInformation0 || ''],
                 otherInformation1: [product?.otherInformation1 || ''],
-                otherInformation2: [product?.otherInformation2 || '', Validators.required]
+                otherInformation2: [product?.otherInformation2 || '', this.showCost ? Validators.required : []]
             }));
         });
         selectedProductsArray.controls.forEach(control => {
@@ -4401,7 +4404,7 @@ class MaterialDataGridComponent extends MaterialNestedComponent {
                 width: '90%',
                 maxWidth: '1000px',
                 autoFocus: false,
-                data: { dropdownsFlag: { showDialogInventory: this.showDialogInventory, showInventory: this.showInventory, inventoryTweek: this.inventoryTweek, quantityTweek: this.quantityTweek, subCategoryTweek: this.subCategoryTweek, categoryTweek: this.categoryTweek, productTweek: this.productTweek, costTweek: this.costTweek, skuTweek: this.skuTweek, priceTweek: this.priceTweek, showDialogCost: this.showDialogCost, showNewProductPicker: this.showNewProductPicker, showDialogSubCategory: this.showDialogSubCategory, showDialogSkuNumber: this.showDialogSkuNumber, showDialogCategory: this.showDialogCategory, showDialogPrice: this.showDialogPrice, showDialogQuantity: this.showDialogQuantity, dropdownL1: this.dropdownL1, dropdownL2: this.dropdownL2, dropdownL3: this.dropdownL3, dropdownL4: this.dropdownL4, dropdownL1Label: this.dropdownL1Label, dropdownL2Label: this.dropdownL2Label, dropdownL3Label: this.dropdownL3Label, dropdownL4Label: this.dropdownL4Label, checkSubmissionStatus: this.checkSubmissionStatus, priceDisable: this.isPriceDisable, showCost: this.showDialogCost }, selectedProducts: this.dataSourceNew }
+                data: { dropdownsFlag: { showDialogInventory: this.showDialogInventory, showInventory: this.showInventory, inventoryTweek: this.inventoryTweek, quantityTweek: this.quantityTweek, subCategoryTweek: this.subCategoryTweek, categoryTweek: this.categoryTweek, productTweek: this.productTweek, costTweek: this.costTweek, skuTweek: this.skuTweek, priceTweek: this.priceTweek, showDialogCost: this.showDialogCost, showNewProductPicker: this.showNewProductPicker, showDialogSubCategory: this.showDialogSubCategory, showDialogSkuNumber: this.showDialogSkuNumber, showDialogCategory: this.showDialogCategory, showDialogPrice: this.showDialogPrice, showDialogQuantity: this.showDialogQuantity, dropdownL1: this.dropdownL1, dropdownL2: this.dropdownL2, dropdownL3: this.dropdownL3, dropdownL4: this.dropdownL4, dropdownL1Label: this.dropdownL1Label, dropdownL2Label: this.dropdownL2Label, dropdownL3Label: this.dropdownL3Label, dropdownL4Label: this.dropdownL4Label, checkSubmissionStatus: this.checkSubmissionStatus, priceDisable: this.isPriceDisable }, selectedProducts: this.dataSourceNew }
             })
                 .afterClosed().subscribe(response => {
                 this.instance.addRow();