@infrab4a/connect-angular 3.4.0-beta.10 → 3.4.0-beta.2

package/angular-connect.module.d.ts

@@ -11,7 +11,7 @@ export declare class AngularConnectModule {
         firebase: FirebaseOptions;
         elasticSearch: AxiosElasticSearchConfig;
         hasura: HasuraGraphQLOptions;
-        backendUrl: string;
+        apiUrl: string;
     }, nameOrConfig?: string | FirebaseAppConfig): ModuleWithProviders<AngularFireModule>;
     static ɵfac: i0.ɵɵFactoryDeclaration<AngularConnectModule, never>;
     static ɵmod: i0.ɵɵNgModuleDeclaration<AngularConnectModule, never, [typeof i1.AngularFireModule, typeof i2.AngularFirestoreModule, typeof i3.AngularHasuraGraphQLModule], never>;

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

@@ -390,7 +390,7 @@
                         }] }];
         } });
 
-    var BACKEND_URL = 'BACKEND_URL';
+    var API_URL = 'API_URL';
 
     var DEFAULT_SHOP = 'DEFAULT_SHOP';
 
@@ -1223,100 +1223,54 @@
         } });
 
     var ShippingService = /** @class */ (function () {
-        function ShippingService(http, apiUrl, homeService) {
+        function ShippingService(http, apiUrl) {
             this.http = http;
             this.apiUrl = apiUrl;
-            this.homeService = homeService;
         }
-        ShippingService.prototype.getShippingMethods = function (shop, zip, weightGrams, totalPrice, personId, subscriptionPlan) {
-            var _this = this;
-            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;
+        ShippingService.prototype.getMensShippingMethods = function (zip, weightGrams, totalPrice, personId, subscriptionPlan) {
+            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) {
+                var shippingMethodsResponse = [];
                 if (!shippingMethods.length)
                     return [];
-                shippingMethods = shippingMethods.map(function (s) {
-                    if (s.ShippingCompanyName == 'Same Day EG')
-                        s.ShippingCompanyName = 'Same Day';
-                    else
-                        return s;
-                });
-                var datasSameDayNotAvaliable = datas.sameDayNotAvaliable;
-                if (_this.isHolidays(datasSameDayNotAvaliable)) {
-                    shippingMethods = shippingMethods.filter(function (method) { return method.ShippingCompanyName !== 'Same Day'; });
-                }
                 if (totalPrice >= 200) {
-                    shippingMethods = shippingMethods.map(function (s) {
+                    return shippingMethods.map(function (s) {
                         if (s.serviceName !== 'Same Day')
                             return Object.assign(Object.assign({}, s), { totalPrice: 0 });
                         else
                             return s;
                     });
                 }
-                if (shop == i1$1.Shops.GLAMSHOP)
-                    return shippingMethods;
-                if (_this.isFreeShippingBySubscription(shop, subscriptionPlan)) {
-                    shippingMethods = shippingMethods.map(function (s) {
-                        if (s.serviceName == 'Same Day')
-                            return Object.assign(Object.assign({}, s), { totalPrice: s.totalPrice / 2 });
-                        else
+                if (subscriptionPlan && subscriptionPlan == 'SELECT') {
+                    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)) {
-                    shippingMethods = shippingMethods.map(function (s) {
-                        return Object.assign(Object.assign({}, s), { totalPrice: s.totalPrice / 2 });
+                if (subscriptionPlan && subscriptionPlan == 'PRIME') {
+                    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;
+                return shippingMethodsResponse;
             }));
         };
-        ShippingService.prototype.isFreeShippingBySubscription = function (shop, subscriptionPlan) {
-            if (!subscriptionPlan)
-                return false;
-            if (shop == i1$1.Shops.MENSMARKET && subscriptionPlan == 'SELECT') {
-                return true;
-            }
-            return false;
-        };
-        ShippingService.prototype.isHalfShippingBySubscription = function (shop, subscriptionPlan) {
-            if (!subscriptionPlan)
-                return false;
-            if (shop == i1$1.Shops.MENSMARKET && subscriptionPlan == 'PRIME') {
-                return true;
-            }
-            if (shop == i1$1.Shops.GLAMSHOP && subscriptionPlan) {
-                return true;
-            }
-            return false;
-        };
-        ShippingService.prototype.isHolidays = function (datas) {
-            var today = new Date();
-            for (var key in datas) {
-                var start = new Date(today.getFullYear() + "-" + datas[key].beginDate);
-                var end = new Date(today.getFullYear() + "-" + datas[key].endDate);
-                if (start > end)
-                    end = new Date(today.getFullYear() + 1 + "-" + datas[key].endDate);
-                if (today >= start && today <= end)
-                    return true;
-            }
-            return false;
-        };
         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: BACKEND_URL }, { token: HomeShopService }], 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: undefined, decorators: [{
                             type: i0.Inject,
-                            args: [BACKEND_URL]
-                        }] }, { type: HomeShopService }];
+                            args: [API_URL]
+                        }] }];
         } });
 
     var AngularFirebaseAuthModule = /** @class */ (function () {
@@ -1910,7 +1864,7 @@
         AngularConnectModule.initializeApp = function (defaultShop, options, nameOrConfig) {
             return {
                 ngModule: AngularConnectModule,
-                providers: __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((i1$1.isNil(defaultShop) ? [] : [{ provide: DEFAULT_SHOP, useValue: defaultShop }]))), __read((i1$1.isNil(options === null || options === void 0 ? void 0 : options.firebase) ? [] : [{ provide: fire.FIREBASE_OPTIONS, useValue: options === null || options === void 0 ? void 0 : options.firebase }]))), __read((i1$1.isNil(options === null || options === void 0 ? void 0 : options.firebase) ? [] : [{ provide: fire.FIREBASE_APP_NAME, useValue: nameOrConfig }]))), __read((i1$1.isNil(options === null || options === void 0 ? void 0 : options.elasticSearch) ? [] : [{ provide: ES_CONFIG, useValue: options.elasticSearch }]))), __read((i1$1.isNil(options === null || options === void 0 ? void 0 : options.hasura) ? [] : [{ provide: HASURA_OPTIONS, useValue: options.hasura }]))), __read((i1$1.isNil(options === null || options === void 0 ? void 0 : options.backendUrl) ? [] : [{ provide: BACKEND_URL, useValue: options.backendUrl }]))),
+                providers: __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], __read((i1$1.isNil(defaultShop) ? [] : [{ provide: DEFAULT_SHOP, useValue: defaultShop }]))), __read((i1$1.isNil(options === null || options === void 0 ? void 0 : options.firebase) ? [] : [{ provide: fire.FIREBASE_OPTIONS, useValue: options === null || options === void 0 ? void 0 : options.firebase }]))), __read((i1$1.isNil(options === null || options === void 0 ? void 0 : options.firebase) ? [] : [{ provide: fire.FIREBASE_APP_NAME, useValue: nameOrConfig }]))), __read((i1$1.isNil(options === null || options === void 0 ? void 0 : options.elasticSearch) ? [] : [{ provide: ES_CONFIG, useValue: options.elasticSearch }]))), __read((i1$1.isNil(options === null || options === void 0 ? void 0 : options.hasura) ? [] : [{ provide: HASURA_OPTIONS, useValue: options.hasura }]))), __read((i1$1.isNil(options === null || options === void 0 ? void 0 : options.apiUrl) ? [] : [{ provide: API_URL, useValue: options.apiUrl }]))),
             };
         };
         return AngularConnectModule;