ng-miam 8.5.7 → 8.5.8

package/bundles/ng-miam.umd.js

@@ -3900,6 +3900,7 @@
           _this.basketIsFetching = false;
           _this.basketPreviewIsCalculating = false;
           _this.basketInitCalled = false;
+          _this.confirming = new rxjs.BehaviorSubject(false);
           _this.basketActionsQueue = new rxjs.BehaviorSubject([]);
           _this._entries$ = new rxjs.BehaviorSubject([]);
           _this.actionsBeingProcessed = new rxjs.BehaviorSubject([]);
@@ -4138,13 +4139,14 @@
        */
       BasketsService.prototype.confirmPaymentAndBasket = function (totalPrice) {
           var _this = this;
+          this.confirming.next(true);
           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);
               }
               return _this._basket$;
-          }));
+          }), operators.tap(function () { return _this.confirming.next(false); }));
       };
       /**
        * Tries to confirm basket. Sends analytic event and refresh current basket on successfull confirmation
@@ -5116,6 +5118,7 @@
           this.supplierService = supplierService;
           this.ignoreUpdatesFromMiam = false;
           this.firstMiamBasketProcess = true;
+          this.lockWhileConfirming = new rxjs.BehaviorSubject(false);
           /**
            * This method needs to be passed to Miam by the retailer
            */
@@ -5125,6 +5128,7 @@
           };
           // Begin listening for miam's basket (will not fetch basket automatically)
           this.supplierService.supplier$.pipe(operators.skipWhile(function (s) { return !s; }), operators.take(1), operators.tap(function () {
+              _this.listenToConfirm();
               _this.listenToMiam();
           })).subscribe();
       }
@@ -5144,6 +5148,19 @@
           enumerable: false,
           configurable: true
       });
+      /**
+       * When basketsService.confirming's last emitted value was true and current emitted value is false,
+       * Reset basket-sync
+       */
+      BasketsSynchronizerService.prototype.listenToConfirm = function () {
+          var _this = this;
+          this.basketsService.confirming.pipe(operators.skipWhile(function (confirming) { return confirming === _this.lockWhileConfirming.value; })).subscribe(function (confirming) {
+              if (!confirming && _this.lockWhileConfirming.value) {
+                  _this.resetMiam();
+              }
+              _this.lockWhileConfirming.next(confirming);
+          });
+      };
       /**
        * Start listening on Miam's basket
        */
@@ -5305,14 +5322,17 @@
        * @param retailerBasket current basket of the retailer
        */
       BasketsSynchronizerService.prototype.retailerBasketChanged = function (retailerBasket) {
+          var _this = this;
           // eslint-disable-next-line no-console
           console.debug("[Miam] Update received from retailer\n      - " + JSON.stringify(retailerBasket) + "\n      - First retailer basket was : " + JSON.stringify(this.firstRetailerBasket));
-          if (!this.isReady()) {
-              return this.initFirstRetailerBasket(retailerBasket);
-          }
-          this.isProcessingRetailerEvent = true;
-          var toRemoveFromMiam = this.comparatorService.updateReceivedFromRetailer(retailerBasket);
-          this.sendUpdateToMiam(toRemoveFromMiam);
+          this.lockWhileConfirming.pipe(operators.skipWhile(function (locked) { return locked; }), operators.take(1)).subscribe(function () {
+              if (!_this.isReady()) {
+                  return _this.initFirstRetailerBasket(retailerBasket);
+              }
+              _this.isProcessingRetailerEvent = true;
+              var toRemoveFromMiam = _this.comparatorService.updateReceivedFromRetailer(retailerBasket);
+              _this.sendUpdateToMiam(toRemoveFromMiam);
+          });
       };
       /**
        * Handle Payment and confirm Miam's basket before restarting the synchronization by resetting retailer's basket
@@ -8572,7 +8592,7 @@
       MiamInterceptor.prototype.setMiamHeaders = function (request) {
           var headersToAdd = {
               'miam-origin': this.context.origin.value,
-              'miam-front-version': '8.5.7',
+              'miam-front-version': '8.5.8',
               'miam-front-type': 'web',
               'miam-api-version': '4.7.0'
           };