ng-miam 4.6.13 → 4.6.15

package/bundles/ng-miam.umd.js

@@ -1154,13 +1154,17 @@
             _this.resource = PointOfSale;
             _this.type = 'point-of-sales';
             _this.pos$ = new rxjs.BehaviorSubject(null);
+            _this.posHasBeenFetched = false;
             _this.register();
             return _this;
         }
         PointOfSalesService.prototype.loadPos = function (posId) {
             var _this = this;
             if (!this.pos$.value || this.pos$.value.id !== posId) {
-                this.get(posId, { include: ['supplier'] }).pipe(operators.skipWhile(function (pos) { return pos.is_loading; }), operators.tap(function (pos) { return _this.pos$.next(pos); })).subscribe();
+                this.get(posId, { include: ['supplier'] }).pipe(operators.skipWhile(function (pos) { return pos.is_loading; }), operators.tap(function (pos) {
+                    _this.posHasBeenFetched = true;
+                    _this.pos$.next(pos);
+                })).subscribe();
             }
             return this.pos$;
         };
@@ -1177,9 +1181,8 @@
                 include: ['supplier']
             }).pipe(operators.skipWhile(function (pos) { return pos.is_loading; }), operators.tap(function (pos) {
                 // TODO when data empty => hide webc
-                if (pos.data.length > 0) {
-                    _this.pos$.next(pos.data[0]);
-                }
+                _this.posHasBeenFetched = true;
+                _this.pos$.next(pos.data[0]);
             })).subscribe();
             return this.pos$;
         };
@@ -10593,13 +10596,18 @@
                 }),
                 this.blockStates.subscribe(function (newState) { return _this.handelblockState(newState); }),
                 this.listsService.takeFirstList().pipe(operators.switchMap(function (list) {
-                    return _this.basketsService.basketPreview$.pipe(operators.skipWhile(function (preview) { return !preview || preview.length === 0 || preview.length !== list.recipeInfos.length; }), operators.tap(function (preview) { return _this.refreshPreview(preview.reverse()); }));
+                    return _this.basketsService.basketPreview$.pipe(
+                    // skipWhile(preview => !preview || preview.length === 0 || preview.length !== list.recipeInfos.length),
+                    operators.skipWhile(function (preview) { return !preview || preview.length !== list.recipeInfos.length; }), operators.tap(function (preview) { return _this.refreshPreview(preview.reverse()); }));
                 })).subscribe(function () {
                     _this.loading.next(false);
                     _this.cdr.detectChanges();
                 }),
                 this.basketsService.basketStats$.pipe(operators.skipWhile(function (stats) { return !stats; }), operators.tap(function (stats) { return _this.statsUpdated.emit(stats); })).subscribe(),
-                this.posService.isPosValid().subscribe(function () {
+                this.posService.isPosValid().subscribe(function (isValid) {
+                    if (!isValid && _this.posService.posHasBeenFetched) {
+                        _this.loading.next(false);
+                    }
                     _this.cdr.detectChanges();
                 })
             ];