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

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

@@ -1,8 +1,8 @@
 (function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core'), require('rxjs'), require('rxjs/operators'), require('@angular/fire/auth'), require('@infrab4a/connect'), require('js-cookie'), require('ts-custom-error'), require('@angular/fire/firestore'), require('@infrab4a/connect/src'), require('@angular/common/http'), require('@angular/fire')) :
-    typeof define === 'function' && define.amd ? define('@infrab4a/connect-angular', ['exports', '@angular/core', 'rxjs', 'rxjs/operators', '@angular/fire/auth', '@infrab4a/connect', 'js-cookie', 'ts-custom-error', '@angular/fire/firestore', '@infrab4a/connect/src', '@angular/common/http', '@angular/fire'], factory) :
-    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory((global.infrab4a = global.infrab4a || {}, global.infrab4a["connect-angular"] = {}), global.ng.core, global.rxjs, global.rxjs.operators, global.ng.fire.auth, global["@infrab4a/connect"], global["js-cookie"], global["ts-custom-error"], global.ng.fire.firestore, global.src, global.ng.common.http, global.ng.fire));
-})(this, (function (exports, i0, rxjs, operators, i1, i1$1, cookie, tsCustomError, i1$2, src, i1$3, fire) { 'use strict';
+    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core'), require('rxjs'), require('rxjs/operators'), require('@angular/fire/auth'), require('@infrab4a/connect'), require('js-cookie'), require('ts-custom-error'), require('@angular/fire/firestore'), require('@angular/common/http'), require('@angular/fire')) :
+    typeof define === 'function' && define.amd ? define('@infrab4a/connect-angular', ['exports', '@angular/core', 'rxjs', 'rxjs/operators', '@angular/fire/auth', '@infrab4a/connect', 'js-cookie', 'ts-custom-error', '@angular/fire/firestore', '@angular/common/http', '@angular/fire'], factory) :
+    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory((global.infrab4a = global.infrab4a || {}, global.infrab4a["connect-angular"] = {}), global.ng.core, global.rxjs, global.rxjs.operators, global.ng.fire.auth, global["@infrab4a/connect"], global["js-cookie"], global["ts-custom-error"], global.ng.fire.firestore, global.ng.common.http, global.ng.fire));
+})(this, (function (exports, i0, rxjs, operators, i1, i1$1, cookie, tsCustomError, i1$2, i1$3, fire) { 'use strict';
 
     function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -1223,56 +1223,49 @@
         } });
 
     var ShippingService = /** @class */ (function () {
-        function ShippingService(http, 
-        //  private homeService: HomeShopService,
-        apiUrl) {
+        function ShippingService(http, apiUrl, homeService) {
             this.http = http;
             this.apiUrl = apiUrl;
+            this.homeService = homeService;
         }
-        ShippingService.prototype.getMensShippingMethods = function (zip, weightGrams, totalPrice, personId, shop, subscriptionPlan) {
+        ShippingService.prototype.getShippingMethods = function (shop, zip, weightGrams, totalPrice, personId, subscriptionPlan) {
             var _this = this;
-            // 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) {
-                    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];
-                });
-            }); }));
+            return rxjs.combineLatest([
+                this.homeService.getHomeData(),
+                this.http.get(this.apiUrl + "open/checkshippingcompany?personId=" + personId + "&postalCode=" + zip + "&weightGrams=" + weightGrams)
+            ])
+                .pipe(operators.map(function (_a) {
+                var _b = __read(_a, 2), datas = _b[0], shippingMethodsResponse = _b[1];
+                var shippingMethods = shippingMethodsResponse.result;
+                if (!shippingMethods.length)
+                    return [];
+                var datasSameDayNotAvaliable = datas.sameDayNotAvaliable;
+                if (_this.isHolidays(datasSameDayNotAvaliable)) {
+                    shippingMethods = shippingMethods.filter(function (method) { return method.ShippingCompanyName !== 'Same Day'; });
+                }
+                if (totalPrice >= 200 || _this.isFreeShippingBySubscription(shop, subscriptionPlan)) {
+                    return shippingMethods.map(function (s) {
+                        if (s.serviceName !== 'Same Day')
+                            return Object.assign(Object.assign({}, s), { totalPrice: 0 });
+                        else
+                            return s;
+                    });
+                }
+                if (_this.isHalfShippingBySubscription(shop, subscriptionPlan)) {
+                    return shippingMethods.map(function (s) {
+                        if (s.serviceName !== 'Same Day')
+                            return Object.assign(Object.assign({}, s), { totalPrice: s.totalPrice / 2 });
+                        else
+                            return s;
+                    });
+                }
+                return shippingMethods;
+            }));
         };
         ShippingService.prototype.isFreeShippingBySubscription = function (shop, subscriptionPlan) {
             if (!subscriptionPlan)
                 return false;
-            if (shop == src.Shops.MENSMARKET && subscriptionPlan == 'SELECT') {
+            if (shop == i1$1.Shops.MENSMARKET && subscriptionPlan == 'SELECT') {
                 return true;
             }
             return false;
@@ -1280,7 +1273,10 @@
         ShippingService.prototype.isHalfShippingBySubscription = function (shop, subscriptionPlan) {
             if (!subscriptionPlan)
                 return false;
-            if (shop == src.Shops.MENSMARKET && subscriptionPlan == 'PRIME') {
+            if (shop == i1$1.Shops.MENSMARKET && subscriptionPlan == 'PRIME') {
+                return true;
+            }
+            if (shop == i1$1.Shops.GLAMSHOP && subscriptionPlan) {
                 return true;
             }
             return false;
@@ -1299,7 +1295,7 @@
         };
         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: 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 }, { token: HomeShopService }], 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
@@ -1307,7 +1303,7 @@
             return [{ type: i1__namespace$3.HttpClient }, { type: undefined, decorators: [{
                             type: i0.Inject,
                             args: [API_URL]
-                        }] }];
+                        }] }, { type: HomeShopService }];
         } });
 
     var AngularFirebaseAuthModule = /** @class */ (function () {