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

package/angular-connect.module.d.ts

@@ -11,7 +11,7 @@ export declare class AngularConnectModule {
         firebase: FirebaseOptions;
         elasticSearch: AxiosElasticSearchConfig;
         hasura: HasuraGraphQLOptions;
-        apiUrl: string;
+        backendUrl: 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 API_URL = 'API_URL';
+    var BACKEND_URL = 'BACKEND_URL';
 
     var DEFAULT_SHOP = 'DEFAULT_SHOP';
 
@@ -1239,24 +1239,35 @@
                 var shippingMethods = shippingMethodsResponse.result;
                 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 || _this.isFreeShippingBySubscription(shop, subscriptionPlan)) {
-                    return shippingMethods.map(function (s) {
+                if (totalPrice >= 200) {
+                    shippingMethods = 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')
+                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
-                            return s;
+                            return Object.assign(Object.assign({}, s), { totalPrice: 0 });
+                    });
+                }
+                if (_this.isHalfShippingBySubscription(shop, subscriptionPlan)) {
+                    shippingMethods = shippingMethods.map(function (s) {
+                        return Object.assign(Object.assign({}, s), { totalPrice: s.totalPrice / 2 });
                     });
                 }
                 return shippingMethods;
@@ -1295,14 +1306,14 @@
         };
         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 }, { 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: BACKEND_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
             }], ctorParameters: function () {
             return [{ type: i1__namespace$3.HttpClient }, { type: undefined, decorators: [{
                             type: i0.Inject,
-                            args: [API_URL]
+                            args: [BACKEND_URL]
                         }] }, { type: HomeShopService }];
         } });
 
@@ -1897,7 +1908,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.apiUrl) ? [] : [{ provide: API_URL, useValue: options.apiUrl }]))),
+                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 }]))),
             };
         };
         return AngularConnectModule;