ng-miam 8.5.2 → 8.5.4

package/bundles/ng-miam.umd.js

@@ -4130,30 +4130,38 @@
           return this.posService.pos$.pipe(operators.skipWhile(function (pos) { return !pos; }), operators.take(1), operators.switchMap(function (pos) { return _this.waitForBasket.pipe(operators.tap(function (basket) { return _this.analyticsService.sendEventsOfResetBasket(basket, eventTrace); }), operators.switchMap(function () { return _this.get("reset?point_of_sale_id=" + pos.id + "&fields[baskets]=" + BASKET_SPARSE_FIELDS.baskets.join(',')).pipe(operators.skipWhile(function (basket) { return basket.is_loading; }), operators.switchMap(function (basket) { return _this.updateLocalBasket(basket); })); })); }));
       };
       /** ********************************************************* CONFIRM BASKET ********************************************************* **/
-      // Set basket as confirmed, and returns only once the new current list is returned
-      BasketsService.prototype.confirmBasket = function (totalPrice) {
+      /**
+       * Sends payment.confirm event then confirm basket if retailer's cart price and Mealz basket price are both non-zero
+       * @param totalPrice The price of retailer's basket
+       * @returns the current basket
+       */
+      BasketsService.prototype.confirmPaymentAndBasket = function (totalPrice) {
           var _this = this;
-          var confirmedBasket;
-          console.debug("[Miam] Confirm basket " + JSON.stringify(confirmedBasket));
-          return this.waitForBasket.pipe(operators.tap(function (basket) {
-              if (basket.totalPrice > 0) {
+          return this.waitForBasket.pipe(operators.switchMap(function (basket) {
+              if (+totalPrice > 0 && basket.totalPrice > 0) {
                   _this.analyticsService.sendEventWhenReady(_this.analyticsService.EVENT_PAYMENT_CONFIRMED, null, _this.eventProps(basket, totalPrice));
+                  return _this.confirmBasket(basket, totalPrice);
               }
-          }), operators.switchMap(function (basket) {
-              console.debug('[Miam] Save basket with confirmed=true');
-              basket.attributes.confirmed = true;
-              return basket.save({ fields: { baskets: __spread(BASKET_SPARSE_FIELDS.baskets, ['token']) } });
-          }), operators.switchMap(function (resp) {
-              confirmedBasket = _this.new();
-              confirmedBasket.fill(resp);
-              console.debug("[Miam] send push analytics event if > 0: " + JSON.stringify(confirmedBasket.totalPrice) + " " + JSON.stringify(confirmedBasket));
-              if (confirmedBasket.totalPrice > 0 && confirmedBasket.token) {
-                  _this.analyticsService.sendEventWhenReady(_this.analyticsService.EVENT_BASKET_CONFIRMED, null, _this.eventProps(confirmedBasket, totalPrice));
-                  localStorage.removeItem('_miam/affiliate');
+              return _this._basket$;
+          }));
+      };
+      /**
+       * Tries to confirm basket. Sends analytic event and refresh current basket on successfull confirmation
+       */
+      BasketsService.prototype.confirmBasket = function (basket, totalPrice) {
+          var _this = this;
+          console.debug('[Miam] Confirm Mealz basket');
+          return this.posService.pos$.pipe(operators.skipWhile(function (pos) { return !pos; }), operators.take(1), operators.switchMap(function (pos) {
+              var url = environment$1.miamAPI + "/api/v1/baskets/confirm?point_of_sale_id=" + pos.id;
+              return _this.http.patch(url, {});
+          }), operators.catchError(function () { return rxjs.of(null); }), operators.switchMap(function (result) {
+              if (!result) {
+                  return rxjs.of(null);
               }
-              _this._basket$.next(undefined);
-              return _this.resetBasket();
-          }), operators.switchMap(function () { return _this._basket$; }), operators.skipWhile(function (b) { return !b; }), operators.map(function () { return confirmedBasket; }));
+              localStorage.removeItem('_miam/affiliate');
+              _this.analyticsService.sendEventWhenReady(_this.analyticsService.EVENT_BASKET_CONFIRMED, null, _this.eventProps(basket, totalPrice));
+              return _this.refreshCurrentBasket();
+          }), operators.take(1));
       };
       BasketsService.prototype.eventProps = function (basket, totalPrice) {
           return {
@@ -5314,7 +5322,7 @@
       BasketsSynchronizerService.prototype.handlePayment = function (total) {
           var _this = this;
           if (total) {
-              this.basketsService.confirmBasket(total).subscribe(function () {
+              this.basketsService.confirmPaymentAndBasket(total).subscribe(function () {
                   _this.firstRetailerBasket = [];
               });
           }
@@ -8548,7 +8556,7 @@
       MiamInterceptor.prototype.setMiamHeaders = function (request) {
           var headersToAdd = {
               'miam-origin': this.context.origin.value,
-              'miam-front-version': '8.5.2',
+              'miam-front-version': '8.5.4',
               'miam-front-type': 'web',
               'miam-api-version': '4.7.0'
           };
@@ -28636,7 +28644,7 @@
                   _this.basketChangedSinceOpened = true;
                   _this.cdr.detectChanges();
               }
-          }), this.basketsService.basket$.pipe(operators.filter(function (basket) { return basket !== null; }), operators.map(function (basket) { return basket.totalPrice; })).subscribe(function (totalPrice) {
+          }), this.basketsService.basket$.pipe(operators.skipWhile(function (basket) { return !basket; }), operators.map(function (basket) { return basket.totalPrice; })).subscribe(function (totalPrice) {
               _this.totalPrice = totalPrice;
               _this.updateShowPlaceOrderFooter();
               _this.cdr.detectChanges();
@@ -28668,18 +28676,24 @@
               _this.registerTrace(result === null || result === void 0 ? void 0 : result.eventTrace);
               if (!(result === null || result === void 0 ? void 0 : result.recipe)) {
                   if (result === null || result === void 0 ? void 0 : result.force) {
-                      _this.previewMode.next(result.previewMode);
-                      _this.previewAllowed = result.previewAllowed;
-                      _this.show = true;
-                      // Put back if/when printing is reimplemented
-                      // this.printService.prepareForPrint(this.elRef);
+                      _this.subscriptions.push(_this.posService.posWasInitialized().pipe(operators.take(1)).subscribe(function (wasInitialized) {
+                          if (!wasInitialized) {
+                              _this.storeLocatorService.storeLocatorOpened$.next(true);
+                          }
+                          _this.previewMode.next(result.previewMode);
+                          _this.previewAllowed = result.previewAllowed;
+                          _this.show = true;
+                          // Put back if/when printing is reimplemented
+                          // this.printService.prepareForPrint(this.elRef);
+                          _this.cdr.detectChanges();
+                      }));
                   }
                   else {
                       _this.show = false;
                       _this._storeLocatorInit = false;
                       _this.storeLocatorService.storeLocatorOpened$.next(false);
+                      _this.cdr.detectChanges();
                   }
-                  _this.cdr.detectChanges();
               }
               else {
                   _this.recipeWasAdded = result.wasAdded;