@vendure/admin-ui 1.6.4 → 1.7.1

package/bundles/vendure-admin-ui-order.umd.js

@@ -546,7 +546,8 @@
             return effectiveTracInventory ? Math.min(unfulfilledCount, stockOnHand) : unfulfilledCount;
         };
         FulfillOrderDialogComponent.prototype.getUnfulfilledCount = function (line) {
-            var fulfilled = line.items.reduce(function (sum, item) { return sum + (item.fulfillment ? 1 : 0); }, 0);
+            var _a, _b;
+            var fulfilled = (_b = (_a = line.fulfillments) === null || _a === void 0 ? void 0 : _a.map(function (f) { return f.summary; }).flat().filter(function (row) { return row.orderLine.id === line.id; }).reduce(function (sum, row) { return sum + row.quantity; }, 0)) !== null && _b !== void 0 ? _b : 0;
             return line.quantity - fulfilled;
         };
         FulfillOrderDialogComponent.prototype.canSubmit = function () {
@@ -653,66 +654,34 @@
         });
         Object.defineProperty(FulfillmentDetailComponent.prototype, "items", {
             get: function () {
-                var e_1, _b, e_2, _c;
-                var _a;
-                var itemMap = new Map();
-                var fulfillmentItemIds = (_a = this.fulfillment) === null || _a === void 0 ? void 0 : _a.orderItems.map(function (i) { return i.id; });
-                try {
-                    for (var _d = __values(this.order.lines), _e = _d.next(); !_e.done; _e = _d.next()) {
-                        var line = _e.value;
-                        try {
-                            for (var _f = (e_2 = void 0, __values(line.items)), _g = _f.next(); !_g.done; _g = _f.next()) {
-                                var item = _g.value;
-                                if (fulfillmentItemIds === null || fulfillmentItemIds === void 0 ? void 0 : fulfillmentItemIds.includes(item.id)) {
-                                    var count = itemMap.get(line.productVariant.name);
-                                    if (count != null) {
-                                        itemMap.set(line.productVariant.name, count + 1);
-                                    }
-                                    else {
-                                        itemMap.set(line.productVariant.name, 1);
-                                    }
-                                }
-                            }
-                        }
-                        catch (e_2_1) { e_2 = { error: e_2_1 }; }
-                        finally {
-                            try {
-                                if (_g && !_g.done && (_c = _f.return)) _c.call(_f);
-                            }
-                            finally { if (e_2) throw e_2.error; }
-                        }
-                    }
-                }
-                catch (e_1_1) { e_1 = { error: e_1_1 }; }
-                finally {
-                    try {
-                        if (_e && !_e.done && (_b = _d.return)) _b.call(_d);
-                    }
-                    finally { if (e_1) throw e_1.error; }
-                }
-                return Array.from(itemMap.entries()).map(function (_b) {
-                    var _c = __read(_b, 2), name = _c[0], quantity = _c[1];
-                    return ({ name: name, quantity: quantity });
-                });
+                var _this = this;
+                var _a, _b;
+                return ((_b = (_a = this.fulfillment) === null || _a === void 0 ? void 0 : _a.summary.map(function (row) {
+                    var _a, _b;
+                    return {
+                        name: (_b = (_a = _this.order.lines.find(function (line) { return line.id === row.orderLine.id; })) === null || _a === void 0 ? void 0 : _a.productVariant.name) !== null && _b !== void 0 ? _b : '',
+                        quantity: row.quantity,
+                    };
+                })) !== null && _b !== void 0 ? _b : []);
             },
             enumerable: false,
             configurable: true
         });
         FulfillmentDetailComponent.prototype.buildCustomFieldsFormGroup = function () {
-            var e_3, _b;
+            var e_1, _c;
             var customFields = this.fulfillment.customFields;
             try {
-                for (var _c = __values(this.serverConfigService.getCustomFieldsFor('Fulfillment')), _d = _c.next(); !_d.done; _d = _c.next()) {
-                    var fieldDef = _d.value;
+                for (var _d = __values(this.serverConfigService.getCustomFieldsFor('Fulfillment')), _e = _d.next(); !_e.done; _e = _d.next()) {
+                    var fieldDef = _e.value;
                     this.customFieldFormGroup.addControl(fieldDef.name, new forms.FormControl(customFields[fieldDef.name]));
                 }
             }
-            catch (e_3_1) { e_3 = { error: e_3_1 }; }
+            catch (e_1_1) { e_1 = { error: e_1_1 }; }
             finally {
                 try {
-                    if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
+                    if (_e && !_e.done && (_c = _d.return)) _c.call(_d);
                 }
-                finally { if (e_3) throw e_3.error; }
+                finally { if (e_1) throw e_1.error; }
             }
         };
         FulfillmentDetailComponent.prototype.customFieldIsObject = function (customField) {
@@ -784,7 +753,8 @@
          * Returns the number of items in an OrderLine which are fulfilled.
          */
         LineFulfillmentComponent.prototype.getDeliveredCount = function (line) {
-            return line.items.reduce(function (sum, item) { return sum + (item.fulfillment ? 1 : 0); }, 0);
+            var _a, _b;
+            return ((_b = (_a = line.fulfillments) === null || _a === void 0 ? void 0 : _a.reduce(function (sum, fulfillment) { var _a, _b; return sum + ((_b = (_a = fulfillment.summary.find(function (s) { return s.orderLine.id === line.id; })) === null || _a === void 0 ? void 0 : _a.quantity) !== null && _b !== void 0 ? _b : 0); }, 0)) !== null && _b !== void 0 ? _b : 0);
         };
         LineFulfillmentComponent.prototype.getFulfillmentStatus = function (fulfilledCount, lineQuantity) {
             if (fulfilledCount === lineQuantity) {
@@ -796,39 +766,15 @@
             return 'none';
         };
         LineFulfillmentComponent.prototype.getFulfillments = function (line) {
-            var e_1, _a;
-            var counts = {};
-            try {
-                for (var _b = __values(line.items), _c = _b.next(); !_c.done; _c = _b.next()) {
-                    var item = _c.value;
-                    if (item.fulfillment) {
-                        if (counts[item.fulfillment.id] === undefined) {
-                            counts[item.fulfillment.id] = 1;
-                        }
-                        else {
-                            counts[item.fulfillment.id]++;
-                        }
-                    }
-                }
-            }
-            catch (e_1_1) { e_1 = { error: e_1_1 }; }
-            finally {
-                try {
-                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
-                }
-                finally { if (e_1) throw e_1.error; }
-            }
-            var all = line.items.reduce(function (fulfillments, item) {
-                return item.fulfillment ? __spreadArray(__spreadArray([], __read(fulfillments)), [item.fulfillment]) : fulfillments;
-            }, []);
-            return Object.entries(counts).map(function (_a) {
-                var _b = __read(_a, 2), id = _b[0], count = _b[1];
+            var _a, _b;
+            return ((_b = (_a = line.fulfillments) === null || _a === void 0 ? void 0 : _a.map(function (fulfillment) {
+                var _a;
+                var summaryLine = fulfillment.summary.find(function (s) { return s.orderLine.id === line.id; });
                 return {
-                    count: count,
-                    // tslint:disable-next-line:no-non-null-assertion
-                    fulfillment: all.find(function (f) { return f.id === id; }),
+                    count: (_a = summaryLine === null || summaryLine === void 0 ? void 0 : summaryLine.quantity) !== null && _a !== void 0 ? _a : 0,
+                    fulfillment: fulfillment,
                 };
-            });
+            })) !== null && _b !== void 0 ? _b : []);
         };
         return LineFulfillmentComponent;
     }());
@@ -973,8 +919,9 @@
     };
 
     var OrderCustomFieldsCardComponent = /** @class */ (function () {
-        function OrderCustomFieldsCardComponent(formBuilder) {
+        function OrderCustomFieldsCardComponent(formBuilder, modalService) {
             this.formBuilder = formBuilder;
+            this.modalService = modalService;
             this.customFieldsConfig = [];
             this.customFieldValues = {};
             this.updateClick = new i0.EventEmitter();
@@ -1002,18 +949,42 @@
             this.customFieldForm.markAsPristine();
             this.editable = false;
         };
+        OrderCustomFieldsCardComponent.prototype.onCancelClick = function () {
+            var _this = this;
+            if (this.customFieldForm.dirty) {
+                this.modalService
+                    .dialog({
+                    title: ngxTranslateExtractMarker.marker('catalog.confirm-cancel'),
+                    buttons: [
+                        { type: 'secondary', label: ngxTranslateExtractMarker.marker('common.keep-editing') },
+                        { type: 'danger', label: ngxTranslateExtractMarker.marker('common.discard-changes'), returnValue: true },
+                    ],
+                })
+                    .subscribe(function (result) {
+                    if (result) {
+                        _this.customFieldForm.reset();
+                        _this.customFieldForm.markAsPristine();
+                        _this.editable = false;
+                    }
+                });
+            }
+            else {
+                this.editable = false;
+            }
+        };
         return OrderCustomFieldsCardComponent;
     }());
     OrderCustomFieldsCardComponent.decorators = [
         { type: i0.Component, args: [{
                     selector: 'vdr-order-custom-fields-card',
-                    template: "<div class=\"card\" *ngIf=\"customFieldsConfig.length\">\r\n    <div class=\"card-header\">\r\n        {{ 'common.custom-fields' | translate }}\r\n    </div>\r\n    <div class=\"card-block\">\r\n        <div class=\"card-text custom-field-form\" [class.editable]=\"editable\">\r\n            <ng-container *ngFor=\"let customField of customFieldsConfig\">\r\n                <vdr-custom-field-control\r\n                    entityName=\"Order\"\r\n                    [customFieldsFormGroup]=\"customFieldForm\"\r\n                    [compact]=\"true\"\r\n                    [readonly]=\"customField.readonly || !editable\"\r\n                    [customField]=\"customField\"\r\n                ></vdr-custom-field-control>\r\n            </ng-container>\r\n        </div>\r\n    </div>\r\n    <div class=\"card-footer\">\r\n        <button class=\"btn btn-sm btn-secondary\" (click)=\"editable = true\" *ngIf=\"!editable\">\r\n            <clr-icon shape=\"pencil\"></clr-icon>\r\n            {{ 'common.edit' | translate }}\r\n        </button>\r\n        <button\r\n            class=\"btn btn-sm btn-primary\"\r\n            (click)=\"onUpdateClick()\"\r\n            *ngIf=\"editable\"\r\n            [disabled]=\"customFieldForm.pristine || customFieldForm.invalid\"\r\n        >\r\n            <clr-icon shape=\"check\"></clr-icon>\r\n            {{ 'common.update' | translate }}\r\n        </button>\r\n    </div>\r\n</div>\r\n",
+                    template: "<div class=\"card\" *ngIf=\"customFieldsConfig.length\">\r\n    <div class=\"card-header\">\r\n        {{ 'common.custom-fields' | translate }}\r\n    </div>\r\n    <div class=\"card-block\">\r\n        <div class=\"card-text custom-field-form\" [class.editable]=\"editable\">\r\n            <vdr-tabbed-custom-fields\r\n                entityName=\"Order\"\r\n                [customFields]=\"customFieldsConfig\"\r\n                [customFieldsFormGroup]=\"customFieldForm\"\r\n                [readonly]=\"!editable\"\r\n                [compact]=\"true\"\r\n            ></vdr-tabbed-custom-fields>\r\n        </div>\r\n    </div>\r\n    <div class=\"card-footer\">\r\n        <button class=\"btn btn-sm btn-secondary\" (click)=\"editable = true\" *ngIf=\"!editable\">\r\n            <clr-icon shape=\"pencil\"></clr-icon>\r\n            {{ 'common.edit' | translate }}\r\n        </button>\r\n        <button\r\n            class=\"btn btn-sm btn-primary\"\r\n            (click)=\"onUpdateClick()\"\r\n            *ngIf=\"editable\"\r\n            [disabled]=\"customFieldForm.pristine || customFieldForm.invalid\"\r\n        >\r\n            <clr-icon shape=\"check\"></clr-icon>\r\n            {{ 'common.update' | translate }}\r\n        </button>\r\n        <button\r\n            class=\"btn btn-sm btn-secondary\"\r\n            (click)=\"onCancelClick()\"\r\n            *ngIf=\"editable\"\r\n        >\r\n            <clr-icon shape=\"times\"></clr-icon>\r\n            {{ 'common.cancel' | translate }}\r\n        </button>\r\n    </div>\r\n</div>\r\n",
                     changeDetection: i0.ChangeDetectionStrategy.OnPush,
                     styles: ["vdr-custom-field-control{margin-bottom:6px;display:block}.custom-field-form ::ng-deep .clr-control-label{color:var(--color-grey-400)}.custom-field-form.editable ::ng-deep .clr-control-label{color:inherit}\n"]
                 },] }
     ];
     OrderCustomFieldsCardComponent.ctorParameters = function () { return [
-        { type: forms.FormBuilder }
+        { type: forms.FormBuilder },
+        { type: i1.ModalService }
     ]; };
     OrderCustomFieldsCardComponent.propDecorators = {
         customFieldsConfig: [{ type: i0.Input }],
@@ -1504,28 +1475,72 @@
         OrderDetailComponent.prototype.transitionPaymentState = function (_d) {
             var _this = this;
             var payment = _d.payment, state = _d.state;
-            this.dataService.order
-                .transitionPaymentToState(payment.id, state)
-                .subscribe(function (_d) {
-                var transitionPaymentToState = _d.transitionPaymentToState;
-                switch (transitionPaymentToState.__typename) {
-                    case 'Payment':
-                        _this.notificationService.success(ngxTranslateExtractMarker.marker('order.transitioned-payment-to-state-success'), {
-                            state: state,
-                        });
-                        _this.dataService.order.getOrder(_this.id).single$.subscribe();
-                        _this.fetchHistory.next();
-                        break;
-                    case 'PaymentStateTransitionError':
-                        _this.notificationService.error(transitionPaymentToState.message);
-                        break;
-                }
-            });
+            if (state === 'Cancelled') {
+                this.dataService.order.cancelPayment(payment.id).subscribe(function (_d) {
+                    var cancelPayment = _d.cancelPayment;
+                    switch (cancelPayment.__typename) {
+                        case 'Payment':
+                            _this.notificationService.success(ngxTranslateExtractMarker.marker('order.transitioned-payment-to-state-success'), {
+                                state: state,
+                            });
+                            _this.dataService.order.getOrder(_this.id).single$.subscribe();
+                            _this.fetchHistory.next();
+                            break;
+                        case 'PaymentStateTransitionError':
+                            _this.notificationService.error(cancelPayment.transitionError);
+                            break;
+                        case 'CancelPaymentError':
+                            _this.notificationService.error(cancelPayment.paymentErrorMessage);
+                            break;
+                    }
+                });
+            }
+            else {
+                this.dataService.order
+                    .transitionPaymentToState(payment.id, state)
+                    .subscribe(function (_d) {
+                    var transitionPaymentToState = _d.transitionPaymentToState;
+                    switch (transitionPaymentToState.__typename) {
+                        case 'Payment':
+                            _this.notificationService.success(ngxTranslateExtractMarker.marker('order.transitioned-payment-to-state-success'), {
+                                state: state,
+                            });
+                            _this.dataService.order.getOrder(_this.id).single$.subscribe();
+                            _this.fetchHistory.next();
+                            break;
+                        case 'PaymentStateTransitionError':
+                            _this.notificationService.error(transitionPaymentToState.message);
+                            break;
+                    }
+                });
+            }
         };
         OrderDetailComponent.prototype.canAddFulfillment = function (order) {
-            var allItemsFulfilled = order.lines
-                .reduce(function (items, line) { return __spreadArray(__spreadArray([], __read(items)), __read(line.items)); }, [])
-                .every(function (item) { return !!item.fulfillment || item.cancelled; });
+            var e_1, _d;
+            var _a;
+            var allFulfillmentSummaryRows = ((_a = order.fulfillments) !== null && _a !== void 0 ? _a : []).reduce(function (all, fulfillment) { return __spreadArray(__spreadArray([], __read(all)), __read(fulfillment.summary)); }, []);
+            var allItemsFulfilled = true;
+            var _loop_1 = function (line) {
+                var totalFulfilledCount = allFulfillmentSummaryRows
+                    .filter(function (row) { return row.orderLine.id === line.id; })
+                    .reduce(function (sum, row) { return sum + row.quantity; }, 0);
+                if (totalFulfilledCount < line.quantity) {
+                    allItemsFulfilled = false;
+                }
+            };
+            try {
+                for (var _e = __values(order.lines), _f = _e.next(); !_f.done; _f = _e.next()) {
+                    var line = _f.value;
+                    _loop_1(line);
+                }
+            }
+            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            finally {
+                try {
+                    if (_f && !_f.done && (_d = _e.return)) _d.call(_e);
+                }
+                finally { if (e_1) throw e_1.error; }
+            }
             return (!allItemsFulfilled &&
                 !this.hasUnsettledModifications(order) &&
                 this.outstandingPaymentAmount(order) === 0 &&
@@ -1540,7 +1555,7 @@
             return sharedUtils.summate(order.modifications.filter(function (m) { return !m.isSettled; }), 'priceChange');
         };
         OrderDetailComponent.prototype.outstandingPaymentAmount = function (order) {
-            var e_1, _d;
+            var e_2, _d;
             var _a, _b, _c;
             var paymentIsValid = function (p) { return p.state !== 'Cancelled' && p.state !== 'Declined' && p.state !== 'Error'; };
             var amountCovered = 0;
@@ -1552,12 +1567,12 @@
                     amountCovered += payment.amount - refundsTotal;
                 }
             }
-            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            catch (e_2_1) { e_2 = { error: e_2_1 }; }
             finally {
                 try {
                     if (_f && !_f.done && (_d = _e.return)) _d.call(_e);
                 }
-                finally { if (e_1) throw e_1.error; }
+                finally { if (e_2) throw e_2.error; }
             }
             return order.totalWithTax - amountCovered;
         };
@@ -2579,6 +2594,7 @@
             _this.serverConfigService = serverConfigService;
             _this.dataService = dataService;
             _this.localStorageService = localStorageService;
+            _this.searchControl = new forms.FormControl('');
             _this.searchOrderCodeControl = new forms.FormControl('');
             _this.searchLastNameControl = new forms.FormControl('');
             _this.orderStates = _this.serverConfigService.getOrderProcessStates().map(function (item) { return item.name; });
@@ -2619,7 +2635,7 @@
             // tslint:disable-next-line:no-shadowed-variable
             function (take, skip) { return _this.dataService.order.getOrders({ take: take, skip: skip }).refetchOnChannelChange(); }, function (data) { return data.orders; }, 
             // tslint:disable-next-line:no-shadowed-variable
-            function (skip, take) { return _this.createQueryOptions(skip, take, _this.searchOrderCodeControl.value, _this.searchLastNameControl.value, _this.route.snapshot.queryParamMap.get('filter') || 'open'); });
+            function (skip, take) { return _this.createQueryOptions(skip, take, _this.searchControl.value, _this.route.snapshot.queryParamMap.get('filter') || 'open'); });
             var lastFilters = _this.localStorageService.get('orderListLastCustomFilters');
             if (lastFilters) {
                 _this.setQueryParam(lastFilters, { replaceUrl: true });
@@ -2631,7 +2647,7 @@
             var _a;
             _super.prototype.ngOnInit.call(this);
             this.activePreset$ = this.route.queryParamMap.pipe(operators.map(function (qpm) { return qpm.get('filter') || 'open'; }), operators.distinctUntilChanged());
-            var searchTerms$ = rxjs.merge(this.searchOrderCodeControl.valueChanges, this.searchLastNameControl.valueChanges).pipe(operators.filter(function (value) { return 2 < value.length || value.length === 0; }), operators.debounceTime(250));
+            var searchTerms$ = rxjs.merge(this.searchControl.valueChanges).pipe(operators.filter(function (value) { return 2 < value.length || value.length === 0; }), operators.debounceTime(250));
             rxjs.merge(searchTerms$, this.route.queryParamMap)
                 .pipe(operators.takeUntil(this.destroy$))
                 .subscribe(function (val) {
@@ -2664,11 +2680,12 @@
         };
         OrderListComponent.prototype.createQueryOptions = function (
         // tslint:disable-next-line:no-shadowed-variable
-        skip, take, orderCodeSearchTerm, customerNameSearchTerm, activeFilterPreset) {
+        skip, take, searchTerm, activeFilterPreset) {
             var _a;
             var filterConfig = this.filterPresets.find(function (p) { return p.name === activeFilterPreset; });
             // tslint:disable-next-line:no-shadowed-variable
             var filter = {};
+            var filterOperator = i1.LogicalOperator.AND;
             if (filterConfig) {
                 if (filterConfig.config.active != null) {
                     filter.active = {
@@ -2710,15 +2727,19 @@
                     };
                 }
             }
-            if (customerNameSearchTerm) {
-                filter.customerLastName = {
-                    contains: customerNameSearchTerm,
-                };
-            }
-            if (orderCodeSearchTerm) {
-                filter.code = {
-                    contains: orderCodeSearchTerm,
+            if (searchTerm) {
+                filter = {
+                    customerLastName: {
+                        contains: searchTerm,
+                    },
+                    transactionId: {
+                        contains: searchTerm,
+                    },
+                    code: {
+                        contains: searchTerm,
+                    },
                 };
+                filterOperator = i1.LogicalOperator.OR;
             }
             return {
                 options: {
@@ -2728,6 +2749,7 @@
                     sort: {
                         updatedAt: i1.SortOrder.DESC,
                     },
+                    filterOperator: filterOperator,
                 },
             };
         };
@@ -2744,7 +2766,7 @@
     OrderListComponent.decorators = [
         { type: i0.Component, args: [{
                     selector: 'vdr-order-list',
-                    template: "<vdr-action-bar>\r\n    <vdr-ab-left>\r\n        <div class=\"search-form\">\r\n            <div class=\"btn-group btn-outline-primary\" *ngIf=\"activePreset$ | async as activePreset\">\r\n                <button\r\n                    class=\"btn\"\r\n                    *ngFor=\"let preset of filterPresets\"\r\n                    [class.btn-primary]=\"activePreset === preset.name\"\r\n                    (click)=\"selectFilterPreset(preset.name)\"\r\n                >\r\n                    {{ preset.label | translate }}\r\n                </button>\r\n                <button\r\n                    class=\"btn\"\r\n                    [class.btn-primary]=\"activePreset === 'custom'\"\r\n                    (click)=\"selectFilterPreset('custom')\"\r\n                >\r\n                    {{ 'order.filter-custom' | translate }}\r\n                    <clr-icon shape=\"angle down\"></clr-icon>\r\n                </button>\r\n            </div>\r\n\r\n            <input\r\n                type=\"text\"\r\n                name=\"searchTerm\"\r\n                [formControl]=\"searchOrderCodeControl\"\r\n                [placeholder]=\"'order.search-by-order-code' | translate\"\r\n                class=\"search-input\"\r\n            />\r\n            <input\r\n                type=\"text\"\r\n                name=\"searchTerm\"\r\n                [formControl]=\"searchLastNameControl\"\r\n                [placeholder]=\"'order.search-by-customer-last-name' | translate\"\r\n                class=\"search-input\"\r\n            />\r\n        </div>\r\n        <div class=\"custom-filters\" [class.expanded]=\"(activePreset$ | async) === 'custom'\">\r\n            <form [formGroup]=\"customFilterForm\">\r\n                <div class=\"flex align-center\">\r\n                    <ng-select\r\n                        [items]=\"orderStates\"\r\n                        appendTo=\"body\"\r\n                        [addTag]=\"false\"\r\n                        [multiple]=\"true\"\r\n                        formControlName=\"states\"\r\n                        [placeholder]=\"'state.all-orders' | translate\"\r\n                        [clearable]=\"true\"\r\n                        [searchable]=\"false\"\r\n                    >\r\n                        <ng-template ng-option-tmp let-item=\"item\">{{ item | stateI18nToken | translate }}</ng-template>\r\n                        <ng-template ng-label-tmp let-item=\"item\" let-clear=\"clear\">\r\n                            <span class=\"ng-value-label\"> {{ item | stateI18nToken | translate }}</span>\r\n                            <span class=\"ng-value-icon right\" (click)=\"clear(item)\" aria-hidden=\"true\">\u00D7</span>\r\n                        </ng-template>\r\n                    </ng-select>\r\n                    <button\r\n                        class=\"btn btn-secondary\"\r\n                        [disabled]=\"customFilterForm.pristine\"\r\n                        (click)=\"applyCustomFilters()\"\r\n                    >\r\n                        {{ 'order.apply-filters' | translate }}\r\n                        <clr-icon shape=\"filter\"></clr-icon>\r\n                    </button>\r\n                </div>\r\n                <div class=\"flex\">\r\n                    <div>\r\n                        <label>{{ 'order.placed-at-start' | translate }}</label>\r\n                        <vdr-datetime-picker formControlName=\"placedAtStart\"></vdr-datetime-picker>\r\n                    </div>\r\n                    <div>\r\n                        <label>{{ 'order.placed-at-end' | translate }}</label>\r\n                        <vdr-datetime-picker formControlName=\"placedAtEnd\"></vdr-datetime-picker>\r\n                    </div>\r\n                </div>\r\n            </form>\r\n        </div>\r\n    </vdr-ab-left>\r\n    <vdr-ab-right>\r\n        <vdr-action-bar-items locationId=\"order-list\"></vdr-action-bar-items>\r\n    </vdr-ab-right>\r\n</vdr-action-bar>\r\n\r\n<vdr-data-table\r\n    [items]=\"items$ | async\"\r\n    [itemsPerPage]=\"itemsPerPage$ | async\"\r\n    [totalItems]=\"totalItems$ | async\"\r\n    [currentPage]=\"currentPage$ | async\"\r\n    (pageChange)=\"setPageNumber($event)\"\r\n    (itemsPerPageChange)=\"setItemsPerPage($event)\"\r\n>\r\n    <vdr-dt-column>{{ 'common.code' | translate }}</vdr-dt-column>\r\n    <vdr-dt-column>{{ 'order.customer' | translate }}</vdr-dt-column>\r\n    <vdr-dt-column>{{ 'order.state' | translate }}</vdr-dt-column>\r\n    <vdr-dt-column>{{ 'order.total' | translate }}</vdr-dt-column>\r\n    <vdr-dt-column>{{ 'common.updated-at' | translate }}</vdr-dt-column>\r\n    <vdr-dt-column>{{ 'order.placed-at' | translate }}</vdr-dt-column>\r\n    <vdr-dt-column>{{ 'order.shipping' | translate }}</vdr-dt-column>\r\n    <vdr-dt-column></vdr-dt-column>\r\n    <ng-template let-order=\"item\">\r\n        <td class=\"left align-middle\">{{ order.code }}</td>\r\n        <td class=\"left align-middle\">\r\n            <vdr-customer-label [customer]=\"order.customer\"></vdr-customer-label>\r\n        </td>\r\n        <td class=\"left align-middle\">\r\n            <vdr-order-state-label [state]=\"order.state\"></vdr-order-state-label>\r\n        </td>\r\n        <td class=\"left align-middle\">{{ order.totalWithTax | localeCurrency: order.currencyCode }}</td>\r\n        <td class=\"left align-middle\">{{ order.updatedAt | timeAgo }}</td>\r\n        <td class=\"left align-middle\">{{ order.orderPlacedAt | localeDate: 'medium' }}</td>\r\n        <td class=\"left align-middle\">{{ getShippingNames(order) }}</td>\r\n        <td class=\"right align-middle\">\r\n            <vdr-table-row-action\r\n                iconShape=\"shopping-cart\"\r\n                [label]=\"'common.open' | translate\"\r\n                [linkTo]=\"order.state === 'Modifying' ? ['./', order.id, 'modify'] : ['./', order.id]\"\r\n            ></vdr-table-row-action>\r\n        </td>\r\n    </ng-template>\r\n</vdr-data-table>\r\n",
+                    template: "<vdr-action-bar>\r\n    <vdr-ab-left>\r\n        <div class=\"search-form\">\r\n            <div class=\"btn-group btn-outline-primary\" *ngIf=\"activePreset$ | async as activePreset\">\r\n                <button\r\n                    class=\"btn\"\r\n                    *ngFor=\"let preset of filterPresets\"\r\n                    [class.btn-primary]=\"activePreset === preset.name\"\r\n                    (click)=\"selectFilterPreset(preset.name)\"\r\n                >\r\n                    {{ preset.label | translate }}\r\n                </button>\r\n                <button\r\n                    class=\"btn\"\r\n                    [class.btn-primary]=\"activePreset === 'custom'\"\r\n                    (click)=\"selectFilterPreset('custom')\"\r\n                >\r\n                    {{ 'order.filter-custom' | translate }}\r\n                    <clr-icon shape=\"angle down\"></clr-icon>\r\n                </button>\r\n            </div>\r\n            <input\r\n                type=\"text\"\r\n                name=\"searchTerm\"\r\n                [formControl]=\"searchControl\"\r\n                [placeholder]=\"'order.search-by-order-filters' | translate\"\r\n                class=\"search-input\"\r\n            />\r\n        </div>\r\n        <div class=\"custom-filters\" [class.expanded]=\"(activePreset$ | async) === 'custom'\">\r\n            <form [formGroup]=\"customFilterForm\">\r\n                <div class=\"flex align-center\">\r\n                    <ng-select\r\n                        [items]=\"orderStates\"\r\n                        appendTo=\"body\"\r\n                        [addTag]=\"false\"\r\n                        [multiple]=\"true\"\r\n                        formControlName=\"states\"\r\n                        [placeholder]=\"'state.all-orders' | translate\"\r\n                        [clearable]=\"true\"\r\n                        [searchable]=\"false\"\r\n                    >\r\n                        <ng-template ng-option-tmp let-item=\"item\">{{ item | stateI18nToken | translate }}</ng-template>\r\n                        <ng-template ng-label-tmp let-item=\"item\" let-clear=\"clear\">\r\n                            <span class=\"ng-value-label\"> {{ item | stateI18nToken | translate }}</span>\r\n                            <span class=\"ng-value-icon right\" (click)=\"clear(item)\" aria-hidden=\"true\">\u00D7</span>\r\n                        </ng-template>\r\n                    </ng-select>\r\n                    <button\r\n                        class=\"btn btn-secondary\"\r\n                        [disabled]=\"customFilterForm.pristine\"\r\n                        (click)=\"applyCustomFilters()\"\r\n                    >\r\n                        {{ 'order.apply-filters' | translate }}\r\n                        <clr-icon shape=\"filter\"></clr-icon>\r\n                    </button>\r\n                </div>\r\n                <div class=\"flex\">\r\n                    <div>\r\n                        <label>{{ 'order.placed-at-start' | translate }}</label>\r\n                        <vdr-datetime-picker formControlName=\"placedAtStart\"></vdr-datetime-picker>\r\n                    </div>\r\n                    <div>\r\n                        <label>{{ 'order.placed-at-end' | translate }}</label>\r\n                        <vdr-datetime-picker formControlName=\"placedAtEnd\"></vdr-datetime-picker>\r\n                    </div>\r\n                </div>\r\n            </form>\r\n        </div>\r\n    </vdr-ab-left>\r\n    <vdr-ab-right>\r\n        <vdr-action-bar-items locationId=\"order-list\"></vdr-action-bar-items>\r\n    </vdr-ab-right>\r\n</vdr-action-bar>\r\n\r\n<vdr-data-table\r\n    [items]=\"items$ | async\"\r\n    [itemsPerPage]=\"itemsPerPage$ | async\"\r\n    [totalItems]=\"totalItems$ | async\"\r\n    [currentPage]=\"currentPage$ | async\"\r\n    (pageChange)=\"setPageNumber($event)\"\r\n    (itemsPerPageChange)=\"setItemsPerPage($event)\"\r\n>\r\n    <vdr-dt-column>{{ 'common.code' | translate }}</vdr-dt-column>\r\n    <vdr-dt-column>{{ 'order.customer' | translate }}</vdr-dt-column>\r\n    <vdr-dt-column>{{ 'order.state' | translate }}</vdr-dt-column>\r\n    <vdr-dt-column>{{ 'order.total' | translate }}</vdr-dt-column>\r\n    <vdr-dt-column>{{ 'common.updated-at' | translate }}</vdr-dt-column>\r\n    <vdr-dt-column>{{ 'order.placed-at' | translate }}</vdr-dt-column>\r\n    <vdr-dt-column>{{ 'order.shipping' | translate }}</vdr-dt-column>\r\n    <vdr-dt-column></vdr-dt-column>\r\n    <ng-template let-order=\"item\">\r\n        <td class=\"left align-middle\">{{ order.code }}</td>\r\n        <td class=\"left align-middle\">\r\n            <vdr-customer-label [customer]=\"order.customer\"></vdr-customer-label>\r\n        </td>\r\n        <td class=\"left align-middle\">\r\n            <vdr-order-state-label [state]=\"order.state\"></vdr-order-state-label>\r\n        </td>\r\n        <td class=\"left align-middle\">{{ order.totalWithTax | localeCurrency: order.currencyCode }}</td>\r\n        <td class=\"left align-middle\">{{ order.updatedAt | timeAgo }}</td>\r\n        <td class=\"left align-middle\">{{ order.orderPlacedAt | localeDate: 'medium' }}</td>\r\n        <td class=\"left align-middle\">{{ getShippingNames(order) }}</td>\r\n        <td class=\"right align-middle\">\r\n            <vdr-table-row-action\r\n                iconShape=\"shopping-cart\"\r\n                [label]=\"'common.open' | translate\"\r\n                [linkTo]=\"order.state === 'Modifying' ? ['./', order.id, 'modify'] : ['./', order.id]\"\r\n            ></vdr-table-row-action>\r\n        </td>\r\n    </ng-template>\r\n</vdr-data-table>\r\n",
                     changeDetection: i0.ChangeDetectionStrategy.OnPush,
                     styles: [".search-form{display:flex;flex-direction:column;align-items:baseline;width:100%;margin-bottom:6px}@media screen and (min-width: 768px){.search-form{flex-direction:row}}.search-input{margin-left:6px;margin-top:6px;min-width:300px}.custom-filters{overflow:hidden;max-height:0;padding-bottom:6px}.custom-filters.expanded{max-height:initial}.custom-filters>form{display:flex;flex-direction:column;align-items:center}.custom-filters>form>div{width:100%}ng-select{flex:1;min-width:200px;height:36px}ng-select ::ng-deep .ng-select-container{height:36px}\n"]
                 },] }
@@ -2770,7 +2792,7 @@
             if (!this.payment) {
                 return [];
             }
-            return this.payment.nextStates.filter(function (s) { return s !== 'Settled'; });
+            return this.payment.nextStates.filter(function (s) { return s !== 'Settled' && s !== 'Error'; });
         };
         return OrderPaymentCardComponent;
     }());