buildingproduct-library 1.2.1 → 1.2.3

package/bundles/buildingproduct-library.umd.js

@@ -1964,6 +1964,7 @@
                             this.getCartId();
                             cartLoaded = sessionStorage.getItem('isCartLoaded');
                             if (!cartLoaded) {
+                                localStorage.removeItem('spartacus⚿dimond-spa⚿cart');
                                 sessionStorage.setItem('isCartLoaded', 'true');
                                 window.location.reload();
                             }
@@ -7632,8 +7633,14 @@
         function OrderHistoryService(http) {
             this.http = http;
         }
-        OrderHistoryService.prototype.getOrderHistoryList = function (data, currentPage) {
-            var url = GET_ORDER_HISTORY_SEARCH_RESULTS.url;
+        OrderHistoryService.prototype.getOrderHistoryList = function (data, currentPage, sortByValue) {
+            var url;
+            if (sortByValue != null || sortByValue != undefined) {
+                url = GET_ORDER_HISTORY_SEARCH_RESULTS.url + '?sort=' + sortByValue;
+            }
+            else {
+                url = GET_ORDER_HISTORY_SEARCH_RESULTS.url;
+            }
             var params = new i1$1.HttpParams();
             params = params.set("currentPage", currentPage);
             return this.http.post(url, data, { params: params });
@@ -7667,7 +7674,7 @@
                 return rxjs.throwError(errorRes);
             }));
         };
-        OrderHistoryService.prototype.sortOrderHistory = function (data, reqPayload) {
+        OrderHistoryService.prototype.sortOrderHistory = function (data, reqPayload, currentPage) {
             var url = ORDER_HISTORY_SORTING_ENDPOINT.url + data;
             return this.http.post(url, reqPayload, {
                 headers: { 'Content-Type': 'application/json' },
@@ -8154,10 +8161,24 @@
         };
         CustomOrderHistoryComponent.prototype.getOrderList = function () {
             var _this = this;
-            var reqObj = {
-                searchParams: this.selectedOrderState,
-            };
-            this.orderHistoryService.getOrderHistoryList(reqObj, this.currentPage)
+            var reqObj;
+            if (this.searchText != '' && (this.selectedOrderType == 'orderNumber' || this.selectedOrderType == 'poNumber')) {
+                this.selectedFilters = [];
+                var obj = {
+                    key: this.selectedOrderType,
+                    value: this.searchText,
+                };
+                this.selectedFilters.push(obj);
+                reqObj = {
+                    searchParams: this.selectedFilters,
+                };
+            }
+            else {
+                reqObj = {
+                    searchParams: this.selectedOrderState,
+                };
+            }
+            this.orderHistoryService.getOrderHistoryList(reqObj, this.currentPage, this.sortByValue)
                 .subscribe(function (data) {
                 var _a;
                 // this.orderHistoryLists = this.orderHistoryLists.length == 0 ? data.orders :  [...this.orderHistoryLists, data?.orders];
@@ -8355,12 +8376,27 @@
         };
         CustomOrderHistoryComponent.prototype.sortBy = function (e) {
             var _this = this;
+            this.currentPage = 0;
             this.sortByValue = e.target.value;
-            var reqObj = {
-                searchParams: this.selectedFilters,
-            };
+            this.selectedFilters = JSON.parse(JSON.stringify(this.selectedOrderState));
+            var reqObj;
+            if (this.searchText != '' && (this.selectedOrderType == 'orderNumber' || this.selectedOrderType == 'poNumber')) {
+                var obj = {
+                    key: this.selectedOrderType,
+                    value: this.searchText,
+                };
+                this.selectedFilters.push(obj);
+                reqObj = {
+                    searchParams: this.selectedFilters,
+                };
+            }
+            else {
+                reqObj = {
+                    searchParams: this.selectedFilters,
+                };
+            }
             this.orderHistoryService
-                .sortOrderHistory(this.sortByValue, reqObj)
+                .sortOrderHistory(this.sortByValue, reqObj, this.currentPage)
                 .subscribe(function (res) {
                 var _a;
                 _this.orderHistoryLists = res === null || res === void 0 ? void 0 : res.orders;
@@ -9402,7 +9438,7 @@
             var val = event.target.value;
             var orderDetail = (_a = this.orderDetails) === null || _a === void 0 ? void 0 : _a.entries;
             this.showWaitCursor.next(true);
-            if (event.currentTarget.checked) {
+            if (event.target.checked) {
                 this.filterVal.push(val.toLowerCase());
                 orderDetail = this.totalRecord.filter(function (el) {
                     return _this.filterVal.find(function (element) {
@@ -9412,9 +9448,8 @@
                 this.cd.detectChanges();
                 this.showWaitCursor.next(false);
             }
-            else {
-                var index = this.filterVal.indexOf(val);
-                this.filterVal.splice(index, 1);
+            if (event.target.checked == false) {
+                this.filterVal = this.filterVal.filter(function (x) { return x.toLowerCase() != val.toLowerCase(); });
                 orderDetail = this.totalRecord.filter(function (el) {
                     return _this.filterVal.find(function (element) {
                         return element === el.statusDisplay.toLowerCase();
@@ -9423,6 +9458,7 @@
                 if (this.filterVal.length == 0) {
                     orderDetail = this.totalRecord;
                 }
+                this.cd.detectChanges();
             }
             this.showWaitCursor.next(false);
             this.cd.detectChanges();
@@ -12296,11 +12332,26 @@
         };
         InvoiceCreditComponent.prototype.sortBy = function (e) {
             var _this = this;
+            var reqObj;
+            this.selectedFilters = JSON.parse(JSON.stringify(this.selectedStatuses));
             this.showWaitCursor.next(true);
             this.sortByValue = e.target.value;
-            var reqObj = {
-                searchParams: this.selectedFilters,
-            };
+            if (this.searchText != '') {
+                this.selectedFilters = [];
+                var obj = {
+                    key: this.selectedOrderType,
+                    value: this.searchText,
+                };
+                this.selectedFilters.push(obj);
+                reqObj = {
+                    searchParams: this.selectedFilters,
+                };
+            }
+            else {
+                reqObj = {
+                    searchParams: this.selectedFilters,
+                };
+            }
             this.myAccountService.sortInvoiceCredit(this.sortByValue, reqObj).subscribe(function (res) {
                 _this.invoiceCreditList = res === null || res === void 0 ? void 0 : res.documents;
                 _this.getStatus();