ng-miam 8.1.5 → 8.1.7

package/bundles/ng-miam.umd.js

@@ -576,72 +576,6 @@
       Icon[Icon["Alert"] = 64] = "Alert";
   })(exports.Icon || (exports.Icon = {}));
 
-  var PointOfSale = /** @class */ (function (_super) {
-      __extends(PointOfSale, _super);
-      function PointOfSale() {
-          var _this = _super.apply(this, __spread(arguments)) || this;
-          _this.attributes = {
-              name: '',
-              settings: {
-                  drive: {
-                      enabled: true,
-                      logo: ''
-                  },
-                  delivery: {
-                      enabled: true,
-                      logo: ''
-                  },
-                  mobile_warning: false
-              },
-              'active-items-count': 0,
-              distance: 0.0,
-              address: '',
-              latitude: '',
-              longitude: '',
-              'ext-id': ''
-          };
-          _this.relationships = {
-              supplier: new i2.DocumentResource(),
-              items: new i2.DocumentCollection()
-          };
-          return _this;
-      }
-      Object.defineProperty(PointOfSale.prototype, "references", {
-          get: function () {
-              return new Intl.NumberFormat('Fr-fr').format(this.attributes['active-items-count']);
-          },
-          enumerable: false,
-          configurable: true
-      });
-      Object.defineProperty(PointOfSale.prototype, "driveEnabled", {
-          get: function () {
-              var settings = this.attributes.settings;
-              return settings && settings.drive && settings.drive.enabled;
-          },
-          enumerable: false,
-          configurable: true
-      });
-      Object.defineProperty(PointOfSale.prototype, "deliveryEnabled", {
-          get: function () {
-              var settings = this.attributes.settings;
-              return settings && settings.delivery && settings.delivery.enabled;
-          },
-          enumerable: false,
-          configurable: true
-      });
-      Object.defineProperty(PointOfSale.prototype, "extId", {
-          get: function () {
-              return this.attributes['ext-id'];
-          },
-          set: function (id) {
-              this.attributes['ext-id'] = id;
-          },
-          enumerable: false,
-          configurable: true
-      });
-      return PointOfSale;
-  }(i2.Resource));
-
   var Ingredient = /** @class */ (function (_super) {
       __extends(Ingredient, _super);
       function Ingredient() {
@@ -843,6 +777,72 @@
       return Item;
   }(i2.Resource));
 
+  var PointOfSale = /** @class */ (function (_super) {
+      __extends(PointOfSale, _super);
+      function PointOfSale() {
+          var _this = _super.apply(this, __spread(arguments)) || this;
+          _this.attributes = {
+              name: '',
+              settings: {
+                  drive: {
+                      enabled: true,
+                      logo: ''
+                  },
+                  delivery: {
+                      enabled: true,
+                      logo: ''
+                  },
+                  mobile_warning: false
+              },
+              'active-items-count': 0,
+              distance: 0.0,
+              address: '',
+              latitude: '',
+              longitude: '',
+              'ext-id': ''
+          };
+          _this.relationships = {
+              supplier: new i2.DocumentResource(),
+              items: new i2.DocumentCollection()
+          };
+          return _this;
+      }
+      Object.defineProperty(PointOfSale.prototype, "references", {
+          get: function () {
+              return new Intl.NumberFormat('Fr-fr').format(this.attributes['active-items-count']);
+          },
+          enumerable: false,
+          configurable: true
+      });
+      Object.defineProperty(PointOfSale.prototype, "driveEnabled", {
+          get: function () {
+              var settings = this.attributes.settings;
+              return settings && settings.drive && settings.drive.enabled;
+          },
+          enumerable: false,
+          configurable: true
+      });
+      Object.defineProperty(PointOfSale.prototype, "deliveryEnabled", {
+          get: function () {
+              var settings = this.attributes.settings;
+              return settings && settings.delivery && settings.delivery.enabled;
+          },
+          enumerable: false,
+          configurable: true
+      });
+      Object.defineProperty(PointOfSale.prototype, "extId", {
+          get: function () {
+              return this.attributes['ext-id'];
+          },
+          set: function (id) {
+              this.attributes['ext-id'] = id;
+          },
+          enumerable: false,
+          configurable: true
+      });
+      return PointOfSale;
+  }(i2.Resource));
+
   var Package = /** @class */ (function (_super) {
       __extends(Package, _super);
       function Package() {
@@ -2049,13 +2049,18 @@
           _this.resource = PointOfSale;
           _this.type = 'point-of-sales';
           _this.pos$ = new rxjs.BehaviorSubject(undefined);
+          _this.posIsLoading$ = new rxjs.BehaviorSubject(false);
           _this.register();
           return _this;
       }
       PointOfSalesService.prototype.loadPos = function (posId) {
           var _this = this;
+          this.posIsLoading$.next(true);
           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.pos$.next(pos);
+                  _this.posIsLoading$.next(false);
+              })).subscribe();
           }
           return this.pos$;
       };
@@ -2063,10 +2068,20 @@
           return this.pos$.pipe(operators.map(function (pos) { var _a, _b, _c; return !!((_c = (_b = (_a = pos === null || pos === void 0 ? void 0 : pos.relationships) === null || _a === void 0 ? void 0 : _a.supplier) === null || _b === void 0 ? void 0 : _b.data) === null || _c === void 0 ? void 0 : _c.id); }));
       };
       PointOfSalesService.prototype.posWasInitialized = function () {
-          return this.pos$.pipe(operators.map(function (pos) { return pos !== undefined; }));
+          return rxjs.combineLatest([
+              this.pos$,
+              this.posIsLoading$
+          ]).pipe(operators.skipWhile(function (_d) {
+              var _e = __read(_d, 2), _pos = _e[0], loading = _e[1];
+              return loading;
+          }), operators.map(function (_d) {
+              var _e = __read(_d, 2), pos = _e[0], _isLoading = _e[1];
+              return pos !== undefined;
+          }));
       };
       PointOfSalesService.prototype.loadPosWithExtId = function (extId) {
           var _this = this;
+          this.posIsLoading$.next(true);
           this.suppliersService.supplier$.pipe(operators.skipWhile(function (supplier) { return !(supplier === null || supplier === void 0 ? void 0 : supplier.id); }), operators.take(1), operators.switchMap(function (supplier) { return _this.all({
               remotefilter: {
                   'ext-id': extId,
@@ -2076,9 +2091,11 @@
           }).pipe(operators.skipWhile(function (pos) { return pos.is_loading; }), operators.tap(function (pos) {
               if (pos.data.length > 0) {
                   _this.pos$.next(pos.data[0]);
+                  _this.posIsLoading$.next(false);
               }
               else {
                   _this.pos$.next(null);
+                  _this.posIsLoading$.next(false);
               }
           })); })).subscribe();
           return this.pos$;
@@ -2936,9 +2953,13 @@
           this.abTestkey = key;
       };
       AnalyticsService.prototype.event = function (name, path, props) {
+          var _a;
           if (this.abTestkey) {
               props.abTestKey = this.abTestkey;
           }
+          if (((_a = localStorage.getItem('_miam/affiliate')) === null || _a === void 0 ? void 0 : _a.length) > 0) {
+              props.affiliate = localStorage.getItem('_miam/affiliate');
+          }
           // eslint-disable-next-line @typescript-eslint/no-unsafe-call
           plausible(name, { u: this.url(path), props: props });
           this.eventEmitter.emit(JSON.stringify({
@@ -3782,6 +3803,7 @@
           if (eventTrace === void 0) { eventTrace = { originPath: '', props: {} }; }
           console.log('[Miam] resetting basket');
           this.analyticsService.sendEventWhenReady(this.analyticsService.EVENT_RECIPE_RESET, eventTrace.originPath, eventTrace.props);
+          localStorage.removeItem('_miam/affiliate');
           this.ignoredBasketsService.resetIgnoredIngredients();
           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); })); })); }));
       };
@@ -3805,6 +3827,7 @@
               console.log("[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');
               }
               _this._basket$.next(undefined);
               return _this.resetBasket();
@@ -8358,35 +8381,33 @@
           var _this = this;
           var transferData = this.getTransferData();
           if (transferData) {
-              this.basketsService.waitForBasket.pipe(operators.take(1), operators.switchMap(function () { return _this.applyBasketTransfer(transferData); }), operators.switchMap(function () { return _this.basketsService.reloadBasket(); })).subscribe();
+              this.setSessionData(transferData);
+              this.applyBasketTransfer(transferData).pipe(operators.switchMap(function () { return _this.basketsService.reloadBasket(); })).subscribe();
           }
       };
       BasketTransferService.prototype.applyBasketTransfer = function (params) {
           var _this = this;
-          this.setSessionData(params);
-          return this.callHookbackIfNotLogged().pipe(operators.skipWhile(function (isLogged) { return !isLogged; }), operators.switchMap(function () { return _this.forcePosIfUnset(params.posExtId); }), operators.skipWhile(function (isPosSet) { return !isPosSet; }), operators.switchMap(function () {
-              return _this.posService.pos$.pipe(operators.skipWhile(function (pos) { return !pos; }), operators.take(1), operators.switchMap(function (pos) {
-                  var posId = pos.id;
-                  var transferBasketUrl = environment$1.miamAPI + "/api/v1/baskets/transfer?point_of_sale_id=" + posId + "&transferred_basket_token=" + params.basketToken;
-                  _this.clearTransferSessionData();
-                  sessionStorage.setItem('_miam/basketActionInterrupted', 'true');
-                  return _this.http.patch(transferBasketUrl, {}).pipe(operators.switchMap(function () {
-                      var getCurrentBasketUrl = environment$1.miamAPI + "/api/v1/baskets/current?point_of_sale_id=" + posId;
-                      return _this.http.get(getCurrentBasketUrl, {}).pipe(operators.switchMap(function () {
-                          sessionStorage.removeItem('_miam/basketActionInterrupted');
-                          return rxjs.of(true);
-                      }));
+          return this.callHookbackIfNotLogged().pipe(operators.skipWhile(function (isLogged) { return !isLogged; }), operators.switchMap(function () { return _this.forcePosIfUnset(params.posExtId); }), operators.skipWhile(function (isPosSet) { return !isPosSet; }), operators.switchMap(function () { return _this.posService.pos$.pipe(operators.skipWhile(function (pos) { return !pos; }), operators.take(1), operators.switchMap(function (pos) { return _this.basketsService.waitForBasket
+              .pipe(operators.map(function () { return pos; })); }), operators.switchMap(function (pos) {
+              var posId = pos.id;
+              var transferBasketUrl = environment$1.miamAPI + "/api/v1/baskets/transfer?point_of_sale_id=" + posId + "&transferred_basket_token=" + params.basketToken;
+              _this.clearTransferSessionData();
+              sessionStorage.setItem('_miam/basketActionInterrupted', 'true');
+              return _this.http.patch(transferBasketUrl, {}).pipe(operators.switchMap(function () {
+                  var getCurrentBasketUrl = environment$1.miamAPI + "/api/v1/baskets/current?point_of_sale_id=" + posId;
+                  return _this.http.get(getCurrentBasketUrl, {}).pipe(operators.switchMap(function () {
+                      sessionStorage.removeItem('_miam/basketActionInterrupted');
+                      return rxjs.of(true);
                   }));
               }));
-          }));
+          })); }));
       };
       BasketTransferService.prototype.setSessionData = function (params) {
-          var basketTokenFromSession = sessionStorage.getItem('_miam/transferredBasketToken');
-          var posExtIdFromSession = sessionStorage.getItem('_miam/pointOfSaleExtId');
-          var isSessionDataMatching = basketTokenFromSession === params.basketToken && posExtIdFromSession === params.posExtId;
-          if (!isSessionDataMatching) {
-              sessionStorage.setItem('_miam/transferredBasketToken', params.basketToken);
-              sessionStorage.setItem('_miam/posOfSaleExtId', params.posExtId);
+          var _a;
+          sessionStorage.setItem('_miam/transferredBasketToken', params.basketToken);
+          sessionStorage.setItem('_miam/posOfSaleExtId', params.posExtId);
+          if (((_a = params.affiliate) === null || _a === void 0 ? void 0 : _a.length) > 0) {
+              localStorage.setItem('_miam/affiliate', params.affiliate);
           }
       };
       BasketTransferService.prototype.clearTransferSessionData = function () {
@@ -8416,8 +8437,8 @@
           return rxjs.combineLatest([
               this.userService.isLogged$,
               this.posService.posWasInitialized()
-          ]).pipe(operators.take(1), operators.map(function (_a) {
-              var _b = __read(_a, 2), isLogged = _b[0], isPosValid = _b[1];
+          ]).pipe(operators.take(1), operators.map(function (_b) {
+              var _c = __read(_b, 2), isLogged = _c[0], isPosValid = _c[1];
               return _this.contextService.hookCallback(isLogged, isPosValid);
           }));
       };
@@ -8432,19 +8453,31 @@
           }));
       };
       BasketTransferService.prototype.getTransferData = function () {
+          var _a;
           var currentUrl = window.location.href;
           var urlParams = new URL(currentUrl).searchParams;
           var basketToken = urlParams.get('transferred_basket_token') || sessionStorage.getItem('_miam/transferredBasketToken');
           var posExtId = urlParams.get('point_of_sale_ext_id') || sessionStorage.getItem('_miam/posOfSaleExtId');
-          var urlWithoutParams = currentUrl.split('?')[0];
-          history.replaceState({}, document.title, urlWithoutParams);
+          var affiliate = (_a = urlParams.get('utm_source')) === null || _a === void 0 ? void 0 : _a.toLowerCase();
           if (basketToken && posExtId) {
-              return { basketToken: basketToken, posExtId: posExtId };
+              this.removeTransferParamsFromUrl();
+              return { basketToken: basketToken, posExtId: posExtId, affiliate: affiliate };
           }
           else {
               return null;
           }
       };
+      BasketTransferService.prototype.removeTransferParamsFromUrl = function () {
+          var currentUrl = window.location.href;
+          var urlQuery = currentUrl.split('?')[1];
+          if (urlQuery) {
+              var urlParams = new URLSearchParams(urlQuery);
+              urlParams.delete('transferred_basket_token');
+              urlParams.delete('point_of_sale_ext_id');
+              var newUrl = currentUrl.split('?')[0] + (urlParams.toString().length > 0 ? '?' + urlParams.toString() : '');
+              history.replaceState({}, document.title, newUrl);
+          }
+      };
       return BasketTransferService;
   }());
   BasketTransferService.ɵfac = function BasketTransferService_Factory(t) { return new (t || BasketTransferService)(i0__namespace.ɵɵinject(BasketsService), i0__namespace.ɵɵinject(ContextService), i0__namespace.ɵɵinject(PointOfSalesService), i0__namespace.ɵɵinject(i1__namespace.HttpClient), i0__namespace.ɵɵinject(UserService)); };
@@ -8516,7 +8549,7 @@
           request = request.clone({
               setHeaders: {
                   'miam-origin': this.context.origin.value,
-                  'miam-front-version': '8.1.5',
+                  'miam-front-version': '8.1.7',
                   'miam-front-type': 'web',
                   'miam-api-version': '4.7.0'
               }