@infrab4a/connect-angular 3.4.0-beta.4 → 3.4.0-beta.5

package/bundles/infrab4a-connect-angular.umd.js

@@ -1223,51 +1223,49 @@
         } });
 
     var ShippingService = /** @class */ (function () {
-        function ShippingService(http, homeService, apiUrl) {
+        function ShippingService(http, 
+        //  private homeService: HomeShopService,
+        apiUrl) {
             this.http = http;
-            this.homeService = homeService;
             this.apiUrl = apiUrl;
         }
         ShippingService.prototype.getMensShippingMethods = function (zip, weightGrams, totalPrice, personId, shop, subscriptionPlan) {
             var _this = this;
-            rxjs.combineLatest([
-                this.homeService.getHomeData(),
-                this.http.get(this.apiUrl + "open/checkshippingcompany?personId=" + personId + "&postalCode=" + zip + "&weightGrams=" + weightGrams)
-            ]).pipe(operators.map(function (datas, shippings) { return console.log('combineLatest', datas, shippings); }));
+            // combineLatest([
+            //   this.homeService.getHomeData(),
+            //   this.http.get(`${this.apiUrl}open/checkshippingcompany?personId=${personId}&postalCode=${zip}&weightGrams=${weightGrams}`)
+            // ]).pipe(
+            //   map((datas, shippings) => console.log('combineLatest', datas, shippings))
+            // )
             return this.http.get(this.apiUrl + "open/checkshippingcompany?personId=" + personId + "&postalCode=" + zip + "&weightGrams=" + weightGrams)
                 .pipe(operators.map(function (data) { return data.result; }), operators.map(function (shippingMethods) { return __awaiter(_this, void 0, void 0, function () {
                 var shippingMethodsResponse, datas;
                 return __generator(this, function (_a) {
-                    switch (_a.label) {
-                        case 0:
-                            shippingMethodsResponse = shippingMethods;
-                            console.log('shippingMethods', shippingMethods);
-                            if (!shippingMethods.length)
-                                return [2 /*return*/, []];
-                            return [4 /*yield*/, this.homeService.getHomeData().toPromise().then(function (data) { return data.sameDayNotAvaliable; })];
-                        case 1:
-                            datas = _a.sent();
-                            if (this.isHolidays(datas)) {
-                                shippingMethodsResponse = shippingMethods.filter(function (method) { return method.ShippingCompanyName !== 'Same Day'; });
-                            }
-                            if (totalPrice >= 200 || this.isFreeShippingBySubscription(shop, subscriptionPlan)) {
-                                return [2 /*return*/, shippingMethodsResponse.map(function (s) {
-                                        if (s.serviceName !== 'Same Day')
-                                            return Object.assign(Object.assign({}, s), { totalPrice: 0 });
-                                        else
-                                            return s;
-                                    })];
-                            }
-                            if (this.isFreeShippingBySubscription(shop, subscriptionPlan)) {
-                                return [2 /*return*/, shippingMethodsResponse.map(function (s) {
-                                        if (s.serviceName !== 'Same Day')
-                                            return Object.assign(Object.assign({}, s), { totalPrice: s.totalPrice / 2 });
-                                        else
-                                            return s;
-                                    })];
-                            }
-                            return [2 /*return*/, shippingMethodsResponse];
+                    shippingMethodsResponse = shippingMethods;
+                    console.log('shippingMethods', shippingMethods);
+                    if (!shippingMethods.length)
+                        return [2 /*return*/, []];
+                    datas = [];
+                    if (this.isHolidays(datas)) {
+                        shippingMethodsResponse = shippingMethods.filter(function (method) { return method.ShippingCompanyName !== 'Same Day'; });
+                    }
+                    if (totalPrice >= 200 || this.isFreeShippingBySubscription(shop, subscriptionPlan)) {
+                        return [2 /*return*/, shippingMethodsResponse.map(function (s) {
+                                if (s.serviceName !== 'Same Day')
+                                    return Object.assign(Object.assign({}, s), { totalPrice: 0 });
+                                else
+                                    return s;
+                            })];
+                    }
+                    if (this.isFreeShippingBySubscription(shop, subscriptionPlan)) {
+                        return [2 /*return*/, shippingMethodsResponse.map(function (s) {
+                                if (s.serviceName !== 'Same Day')
+                                    return Object.assign(Object.assign({}, s), { totalPrice: s.totalPrice / 2 });
+                                else
+                                    return s;
+                            })];
                     }
+                    return [2 /*return*/, shippingMethodsResponse];
                 });
             }); }));
         };
@@ -1301,12 +1299,12 @@
         };
         return ShippingService;
     }());
-    ShippingService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.12", ngImport: i0__namespace, type: ShippingService, deps: [{ token: i1__namespace$3.HttpClient }, { token: HomeShopService }, { token: API_URL }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
+    ShippingService.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.12", ngImport: i0__namespace, type: ShippingService, deps: [{ token: i1__namespace$3.HttpClient }, { token: API_URL }], target: i0__namespace.ɵɵFactoryTarget.Injectable });
     ShippingService.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.12", ngImport: i0__namespace, type: ShippingService });
     i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.12", ngImport: i0__namespace, type: ShippingService, decorators: [{
                 type: i0.Injectable
             }], ctorParameters: function () {
-            return [{ type: i1__namespace$3.HttpClient }, { type: HomeShopService }, { type: undefined, decorators: [{
+            return [{ type: i1__namespace$3.HttpClient }, { type: undefined, decorators: [{
                             type: i0.Inject,
                             args: [API_URL]
                         }] }];