ng-miam 9.0.11 → 9.0.12

package/bundles/ng-miam.umd.js

@@ -5709,20 +5709,13 @@
        * Fetches the BasketEntry for an ingredient if it exists
        * Returns a fake BasketEntry with id = -1 if it doesn't exist
        */
-      BasketsService.prototype.basketEntryFromIngredient = function (ingredientId, guests, onlyQuantity, selectedItemId) {
+      BasketsService.prototype.basketEntryFromIngredient = function (ingredientId, guests, selectedItemId) {
           var _this = this;
-          if (onlyQuantity === void 0) { onlyQuantity = false; }
           return this.waitForBasket.pipe(operators.switchMap(function (basket) {
-              var url = environment$1.miamAPI + "/api/v1/baskets/" + basket.id + "/basket-entries/from-ingredient?ingredient_id=" + ingredientId + "&guests=" + guests;
+              var url = environment$1.miamAPI + "/api/v1/baskets/" + basket.id + "/basket-entries/from-ingredient?ingredient_id=" + ingredientId + "&guests=" + guests + "&include=selected-item";
               if (selectedItemId) {
                   url += "&selected_item_id=" + selectedItemId;
               }
-              if (onlyQuantity) {
-                  url += '&fields[basket-entries]=quantity,quantity-to-add';
-              }
-              else {
-                  url += '&include=selected-item';
-              }
               return _this.http.get(url);
           }), operators.skipWhile(function (result) { return !result; }), operators.map(function (res) {
               var entry = _this.basketEntriesService.new();
@@ -10032,14 +10025,24 @@
           if (!fromInit) {
               this.ingredientToBasketLoading = true;
           }
-          var basketEntries$ = this.recipe.ingredients.map(function (ingredient) { return _this.basketsService.basketEntryFromIngredient(ingredient.id, _this.recipe.modifiedGuests, !fromInit).pipe(operators.map(function (basketEntry) { return ({ ingredient: ingredient, basketEntry: basketEntry }); })); });
+          var basketEntries$ = this.recipe.ingredients.map(function (ingredient) { return _this.basketsService.basketEntryFromIngredient(ingredient.id, _this.recipe.modifiedGuests).pipe(operators.map(function (basketEntry) { return ({ ingredient: ingredient, basketEntry: basketEntry }); })); });
           return rxjs.forkJoin(basketEntries$).pipe(operators.switchMap(function (basketEntriesResult) {
-              if (fromInit) {
+              var updateProducts = function () {
                   _this.products = basketEntriesResult;
-                  return _this.setProductsByCategory();
+                  _this.setProductsByCategory();
+              };
+              if (fromInit) {
+                  updateProducts();
+                  return rxjs.of([]);
               }
               else {
-                  _this.updatePriceOnGuestChange(basketEntriesResult);
+                  var hasSelectedItemChanged = basketEntriesResult.some(function (incomingProduct) { return _this.products.some(function (p) { return p.basketEntry.attributes['selected-item-id'] ===
+                      incomingProduct.basketEntry.attributes['selected-item-id']; }); });
+                  // If at least one selected item has changed, we need to refresh categories
+                  // and prices entirely instead of only updating quantities
+                  hasSelectedItemChanged
+                      ? updateProducts()
+                      : _this.updatePriceOnGuestChange(basketEntriesResult);
                   return rxjs.of(_this.products);
               }
           }), operators.switchMap(function () { return rxjs.of(_this.products); }));
@@ -17011,7 +17014,7 @@
               _this.rollbackReplace();
           });
           this.basketSynchroService.addToActionList([removeIngredient]);
-          this.subscriptions.push(this.basketsService.basketEntryFromIngredient(this.ingredient.id, +this.recipe.modifiedGuests, true, item.id).pipe(operators.switchMap(function (newEntry) {
+          this.subscriptions.push(this.basketsService.basketEntryFromIngredient(this.ingredient.id, +this.recipe.modifiedGuests, item.id).pipe(operators.switchMap(function (newEntry) {
               var newBasketEntry = deepCloneWithClass(_this.basketEntry);
               newBasketEntry.quantityToAdd = newEntry.quantityToAdd;
               _this.replaceRelationship(newBasketEntry, item);
@@ -17039,7 +17042,7 @@
       };
       ReplaceItemComponent.prototype.addToBasket = function (item) {
           var _this = this;
-          this.subscriptions.push(this.recipeDetailsService.canAddProductToBasket(this.getAddIngredientMethod(), this.eventTrace).pipe(operators.filter(function (passed) { return passed; }), operators.switchMap(function () { return _this.basketsService.basketEntryFromIngredient(_this.ingredient.id, +_this.recipe.modifiedGuests, true, item.id); })).subscribe(function (newEntry) { return _this.handleAddToBasketResponse(newEntry); }));
+          this.subscriptions.push(this.recipeDetailsService.canAddProductToBasket(this.getAddIngredientMethod(), this.eventTrace).pipe(operators.filter(function (passed) { return passed; }), operators.switchMap(function () { return _this.basketsService.basketEntryFromIngredient(_this.ingredient.id, +_this.recipe.modifiedGuests, item.id); })).subscribe(function (newEntry) { return _this.handleAddToBasketResponse(newEntry); }));
           this.cdr.detectChanges();
       };
       ReplaceItemComponent.prototype.getAddIngredientMethod = function () {