@infrab4a/connect-angular 3.4.0-beta.10 → 3.4.0-beta.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/angular-connect.module.d.ts +1 -1
- package/bundles/infrab4a-connect-angular.umd.js +123 -63
- package/bundles/infrab4a-connect-angular.umd.js.map +1 -1
- package/consts/api-url.const.d.ts +1 -0
- package/consts/index.d.ts +1 -1
- package/esm2015/angular-connect.module.js +3 -3
- package/esm2015/consts/api-url.const.js +2 -0
- package/esm2015/consts/index.js +2 -2
- package/esm2015/services/shipping.service.js +27 -40
- package/esm2015/services/types/shipping-methods.type.js +1 -1
- package/fesm2015/infrab4a-connect-angular.js +28 -41
- package/fesm2015/infrab4a-connect-angular.js.map +1 -1
- package/package-lock.json +18 -0
- package/package.json +2 -2
- package/services/shipping.service.d.ts +4 -5
- package/services/types/shipping-methods.type.d.ts +1 -1
- package/consts/backend-url.const.d.ts +0 -1
- package/esm2015/consts/backend-url.const.js +0 -2
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare const API_URL = "API_URL";
|
package/consts/index.d.ts
CHANGED
|
@@ -3,7 +3,7 @@ import { AngularFireModule, FIREBASE_APP_NAME, FIREBASE_OPTIONS } from '@angular
|
|
|
3
3
|
import { isNil } from '@infrab4a/connect';
|
|
4
4
|
import { AngularFirestoreModule } from './angular-firestore.module';
|
|
5
5
|
import { AngularHasuraGraphQLModule } from './angular-hasura-graphql.module';
|
|
6
|
-
import {
|
|
6
|
+
import { API_URL, DEFAULT_SHOP, ES_CONFIG, HASURA_OPTIONS } from './consts';
|
|
7
7
|
import { AuthService, CartService, CheckoutService, CheckoutSubscriptionService, CouponService, HomeShopService, OrderService, ShippingService } from './services';
|
|
8
8
|
import * as i0 from "@angular/core";
|
|
9
9
|
export class AngularConnectModule {
|
|
@@ -16,7 +16,7 @@ export class AngularConnectModule {
|
|
|
16
16
|
...(isNil(options === null || options === void 0 ? void 0 : options.firebase) ? [] : [{ provide: FIREBASE_APP_NAME, useValue: nameOrConfig }]),
|
|
17
17
|
...(isNil(options === null || options === void 0 ? void 0 : options.elasticSearch) ? [] : [{ provide: ES_CONFIG, useValue: options.elasticSearch }]),
|
|
18
18
|
...(isNil(options === null || options === void 0 ? void 0 : options.hasura) ? [] : [{ provide: HASURA_OPTIONS, useValue: options.hasura }]),
|
|
19
|
-
...(isNil(options === null || options === void 0 ? void 0 : options.
|
|
19
|
+
...(isNil(options === null || options === void 0 ? void 0 : options.apiUrl) ? [] : [{ provide: API_URL, useValue: options.apiUrl }]),
|
|
20
20
|
],
|
|
21
21
|
};
|
|
22
22
|
}
|
|
@@ -49,4 +49,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.12", ngImpo
|
|
|
49
49
|
],
|
|
50
50
|
}]
|
|
51
51
|
}] });
|
|
52
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
52
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYW5ndWxhci1jb25uZWN0Lm1vZHVsZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3Byb2plY3RzL2Nvbm5lY3QtYW5ndWxhci9zcmMvYW5ndWxhci1jb25uZWN0Lm1vZHVsZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQXVCLFFBQVEsRUFBRSxNQUFNLGVBQWUsQ0FBQTtBQUM3RCxPQUFPLEVBQ0wsaUJBQWlCLEVBQ0EsaUJBQWlCLEVBQ2xDLGdCQUFnQixFQUNqQixNQUFNLGVBQWUsQ0FBQTtBQUN0QixPQUFPLEVBQTRCLEtBQUssRUFBUyxNQUFNLG1CQUFtQixDQUFBO0FBRTFFLE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxNQUFNLDRCQUE0QixDQUFBO0FBQ25FLE9BQU8sRUFBRSwwQkFBMEIsRUFBd0IsTUFBTSxpQ0FBaUMsQ0FBQTtBQUNsRyxPQUFPLEVBQUUsT0FBTyxFQUFFLFlBQVksRUFBRSxTQUFTLEVBQUUsY0FBYyxFQUFFLE1BQU0sVUFBVSxDQUFBO0FBQzNFLE9BQU8sRUFDTCxXQUFXLEVBQ1gsV0FBVyxFQUNYLGVBQWUsRUFDZiwyQkFBMkIsRUFDM0IsYUFBYSxFQUNiLGVBQWUsRUFDZixZQUFZLEVBQ1osZUFBZSxFQUNoQixNQUFNLFlBQVksQ0FBQTs7QUFlbkIsTUFBTSxPQUFPLG9CQUFvQjtJQUMvQixNQUFNLENBQUMsYUFBYSxDQUNsQixXQUFrQixFQUNsQixPQUE2SCxFQUM3SCxZQUF5QztRQUV6QyxPQUFPO1lBQ0wsUUFBUSxFQUFFLG9CQUFvQjtZQUM5QixTQUFTLEVBQUU7Z0JBQ1QsR0FBRyxDQUFDLEtBQUssQ0FBQyxXQUFXLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUUsT0FBTyxFQUFFLFlBQVksRUFBRSxRQUFRLEVBQUUsV0FBVyxFQUFFLENBQUMsQ0FBQztnQkFDakYsR0FBRyxDQUFDLEtBQUssQ0FBQyxPQUFPLGFBQVAsT0FBTyx1QkFBUCxPQUFPLENBQUUsUUFBUSxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxRQUFRLEVBQUUsT0FBTyxhQUFQLE9BQU8sdUJBQVAsT0FBTyxDQUFFLFFBQVEsRUFBRSxDQUFDLENBQUM7Z0JBQ2pHLEdBQUcsQ0FBQyxLQUFLLENBQUMsT0FBTyxhQUFQLE9BQU8sdUJBQVAsT0FBTyxDQUFFLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRSxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsUUFBUSxFQUFFLFlBQVksRUFBRSxDQUFDLENBQUM7Z0JBQzdGLEdBQUcsQ0FBQyxLQUFLLENBQUMsT0FBTyxhQUFQLE9BQU8sdUJBQVAsT0FBTyxDQUFFLGFBQWEsQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRSxPQUFPLEVBQUUsU0FBUyxFQUFFLFFBQVEsRUFBRSxPQUFPLENBQUMsYUFBYSxFQUFFLENBQUMsQ0FBQztnQkFDbkcsR0FBRyxDQUFDLEtBQUssQ0FBQyxPQUFPLGFBQVAsT0FBTyx1QkFBUCxPQUFPLENBQUUsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLE9BQU8sRUFBRSxjQUFjLEVBQUUsUUFBUSxFQUFFLE9BQU8sQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQUFDO2dCQUMxRixHQUFHLENBQUMsS0FBSyxDQUFDLE9BQU8sYUFBUCxPQUFPLHVCQUFQLE9BQU8sQ0FBRSxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUUsT0FBTyxFQUFFLE9BQU8sRUFBRSxRQUFRLEVBQUUsT0FBTyxDQUFDLE1BQU0sRUFBRSxDQUFDLENBQUM7YUFDcEY7U0FDRixDQUFBO0lBQ0gsQ0FBQzs7a0hBakJVLG9CQUFvQjttSEFBcEIsb0JBQW9CLFlBWnJCLGlCQUFpQixFQUFFLHNCQUFzQixFQUFFLDBCQUEwQjttSEFZcEUsb0JBQW9CLGFBWHBCO1FBQ1QsV0FBVztRQUNYLFdBQVc7UUFDWCxlQUFlO1FBQ2YsMkJBQTJCO1FBQzNCLGFBQWE7UUFDYixlQUFlO1FBQ2YsWUFBWTtRQUNaLGVBQWU7S0FDaEIsWUFWUSxDQUFDLGlCQUFpQixFQUFFLHNCQUFzQixFQUFFLDBCQUEwQixDQUFDOzRGQVlyRSxvQkFBb0I7a0JBYmhDLFFBQVE7bUJBQUM7b0JBQ1IsT0FBTyxFQUFFLENBQUMsaUJBQWlCLEVBQUUsc0JBQXNCLEVBQUUsMEJBQTBCLENBQUM7b0JBQ2hGLFNBQVMsRUFBRTt3QkFDVCxXQUFXO3dCQUNYLFdBQVc7d0JBQ1gsZUFBZTt3QkFDZiwyQkFBMkI7d0JBQzNCLGFBQWE7d0JBQ2IsZUFBZTt3QkFDZixZQUFZO3dCQUNaLGVBQWU7cUJBQ2hCO2lCQUNGIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgTW9kdWxlV2l0aFByb3ZpZGVycywgTmdNb2R1bGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJ1xyXG5pbXBvcnQge1xyXG4gIEFuZ3VsYXJGaXJlTW9kdWxlLCBGaXJlYmFzZUFwcENvbmZpZyxcclxuICBGaXJlYmFzZU9wdGlvbnMsIEZJUkVCQVNFX0FQUF9OQU1FLFxyXG4gIEZJUkVCQVNFX09QVElPTlNcclxufSBmcm9tICdAYW5ndWxhci9maXJlJ1xyXG5pbXBvcnQgeyBBeGlvc0VsYXN0aWNTZWFyY2hDb25maWcsIGlzTmlsLCBTaG9wcyB9IGZyb20gJ0BpbmZyYWI0YS9jb25uZWN0J1xyXG5cclxuaW1wb3J0IHsgQW5ndWxhckZpcmVzdG9yZU1vZHVsZSB9IGZyb20gJy4vYW5ndWxhci1maXJlc3RvcmUubW9kdWxlJ1xyXG5pbXBvcnQgeyBBbmd1bGFySGFzdXJhR3JhcGhRTE1vZHVsZSwgSGFzdXJhR3JhcGhRTE9wdGlvbnMgfSBmcm9tICcuL2FuZ3VsYXItaGFzdXJhLWdyYXBocWwubW9kdWxlJ1xyXG5pbXBvcnQgeyBBUElfVVJMLCBERUZBVUxUX1NIT1AsIEVTX0NPTkZJRywgSEFTVVJBX09QVElPTlMgfSBmcm9tICcuL2NvbnN0cydcclxuaW1wb3J0IHtcclxuICBBdXRoU2VydmljZSxcclxuICBDYXJ0U2VydmljZSxcclxuICBDaGVja291dFNlcnZpY2UsXHJcbiAgQ2hlY2tvdXRTdWJzY3JpcHRpb25TZXJ2aWNlLFxyXG4gIENvdXBvblNlcnZpY2UsXHJcbiAgSG9tZVNob3BTZXJ2aWNlLFxyXG4gIE9yZGVyU2VydmljZSxcclxuICBTaGlwcGluZ1NlcnZpY2VcclxufSBmcm9tICcuL3NlcnZpY2VzJ1xyXG5cclxuQE5nTW9kdWxlKHtcclxuICBpbXBvcnRzOiBbQW5ndWxhckZpcmVNb2R1bGUsIEFuZ3VsYXJGaXJlc3RvcmVNb2R1bGUsIEFuZ3VsYXJIYXN1cmFHcmFwaFFMTW9kdWxlXSxcclxuICBwcm92aWRlcnM6IFtcclxuICAgIEF1dGhTZXJ2aWNlLFxyXG4gICAgQ2FydFNlcnZpY2UsXHJcbiAgICBDaGVja291dFNlcnZpY2UsXHJcbiAgICBDaGVja291dFN1YnNjcmlwdGlvblNlcnZpY2UsXHJcbiAgICBDb3Vwb25TZXJ2aWNlLFxyXG4gICAgSG9tZVNob3BTZXJ2aWNlLFxyXG4gICAgT3JkZXJTZXJ2aWNlLFxyXG4gICAgU2hpcHBpbmdTZXJ2aWNlXHJcbiAgXSxcclxufSlcclxuZXhwb3J0IGNsYXNzIEFuZ3VsYXJDb25uZWN0TW9kdWxlIHtcclxuICBzdGF0aWMgaW5pdGlhbGl6ZUFwcChcclxuICAgIGRlZmF1bHRTaG9wOiBTaG9wcyxcclxuICAgIG9wdGlvbnM6IHsgZmlyZWJhc2U6IEZpcmViYXNlT3B0aW9uczsgZWxhc3RpY1NlYXJjaDogQXhpb3NFbGFzdGljU2VhcmNoQ29uZmlnOyBoYXN1cmE6IEhhc3VyYUdyYXBoUUxPcHRpb25zLCBhcGlVcmw6IHN0cmluZyB9LFxyXG4gICAgbmFtZU9yQ29uZmlnPzogc3RyaW5nIHwgRmlyZWJhc2VBcHBDb25maWcsXHJcbiAgKTogTW9kdWxlV2l0aFByb3ZpZGVyczxBbmd1bGFyRmlyZU1vZHVsZT4ge1xyXG4gICAgcmV0dXJuIHtcclxuICAgICAgbmdNb2R1bGU6IEFuZ3VsYXJDb25uZWN0TW9kdWxlLFxyXG4gICAgICBwcm92aWRlcnM6IFtcclxuICAgICAgICAuLi4oaXNOaWwoZGVmYXVsdFNob3ApID8gW10gOiBbeyBwcm92aWRlOiBERUZBVUxUX1NIT1AsIHVzZVZhbHVlOiBkZWZhdWx0U2hvcCB9XSksXHJcbiAgICAgICAgLi4uKGlzTmlsKG9wdGlvbnM/LmZpcmViYXNlKSA/IFtdIDogW3sgcHJvdmlkZTogRklSRUJBU0VfT1BUSU9OUywgdXNlVmFsdWU6IG9wdGlvbnM/LmZpcmViYXNlIH1dKSxcclxuICAgICAgICAuLi4oaXNOaWwob3B0aW9ucz8uZmlyZWJhc2UpID8gW10gOiBbeyBwcm92aWRlOiBGSVJFQkFTRV9BUFBfTkFNRSwgdXNlVmFsdWU6IG5hbWVPckNvbmZpZyB9XSksXHJcbiAgICAgICAgLi4uKGlzTmlsKG9wdGlvbnM/LmVsYXN0aWNTZWFyY2gpID8gW10gOiBbeyBwcm92aWRlOiBFU19DT05GSUcsIHVzZVZhbHVlOiBvcHRpb25zLmVsYXN0aWNTZWFyY2ggfV0pLFxyXG4gICAgICAgIC4uLihpc05pbChvcHRpb25zPy5oYXN1cmEpID8gW10gOiBbeyBwcm92aWRlOiBIQVNVUkFfT1BUSU9OUywgdXNlVmFsdWU6IG9wdGlvbnMuaGFzdXJhIH1dKSxcclxuICAgICAgICAuLi4oaXNOaWwob3B0aW9ucz8uYXBpVXJsKSA/IFtdIDogW3sgcHJvdmlkZTogQVBJX1VSTCwgdXNlVmFsdWU6IG9wdGlvbnMuYXBpVXJsIH1dKSxcclxuICAgICAgXSxcclxuICAgIH1cclxuICB9XHJcbn1cclxuIl19
|
|
@@ -0,0 +1,2 @@
|
|
|
1
|
+
export const API_URL = 'API_URL';
|
|
2
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYXBpLXVybC5jb25zdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3Byb2plY3RzL2Nvbm5lY3QtYW5ndWxhci9zcmMvY29uc3RzL2FwaS11cmwuY29uc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsTUFBTSxDQUFDLE1BQU0sT0FBTyxHQUFHLFNBQVMsQ0FBQSIsInNvdXJjZXNDb250ZW50IjpbImV4cG9ydCBjb25zdCBBUElfVVJMID0gJ0FQSV9VUkwnIl19
|
package/esm2015/consts/index.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
export * from './
|
|
1
|
+
export * from './api-url.const';
|
|
2
2
|
export * from './default-shop.const';
|
|
3
3
|
export * from './es-config.const';
|
|
4
4
|
export * from './hasura-options.const';
|
|
5
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
5
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9wcm9qZWN0cy9jb25uZWN0LWFuZ3VsYXIvc3JjL2NvbnN0cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLGlCQUFpQixDQUFBO0FBQy9CLGNBQWMsc0JBQXNCLENBQUE7QUFDcEMsY0FBYyxtQkFBbUIsQ0FBQTtBQUNqQyxjQUFjLHdCQUF3QixDQUFBIiwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0ICogZnJvbSAnLi9hcGktdXJsLmNvbnN0J1xyXG5leHBvcnQgKiBmcm9tICcuL2RlZmF1bHQtc2hvcC5jb25zdCdcclxuZXhwb3J0ICogZnJvbSAnLi9lcy1jb25maWcuY29uc3QnXHJcbmV4cG9ydCAqIGZyb20gJy4vaGFzdXJhLW9wdGlvbnMuY29uc3QnXHJcbiJdfQ==
|
|
@@ -1,63 +1,53 @@
|
|
|
1
|
+
import { __awaiter } from "tslib";
|
|
1
2
|
import { HttpClient } from '@angular/common/http';
|
|
2
3
|
import { Inject, Injectable } from '@angular/core';
|
|
3
|
-
import { Shops } from '@infrab4a/connect';
|
|
4
|
+
import { Shops } from '@infrab4a/connect/src';
|
|
4
5
|
import { combineLatest } from 'rxjs';
|
|
5
6
|
import { map } from 'rxjs/operators';
|
|
6
|
-
import {
|
|
7
|
+
import { API_URL } from '../consts';
|
|
7
8
|
import { HomeShopService } from './home-shop.service';
|
|
8
9
|
import * as i0 from "@angular/core";
|
|
9
10
|
import * as i1 from "@angular/common/http";
|
|
10
11
|
import * as i2 from "./home-shop.service";
|
|
11
12
|
export class ShippingService {
|
|
12
|
-
constructor(http,
|
|
13
|
+
constructor(http, homeService, apiUrl) {
|
|
13
14
|
this.http = http;
|
|
14
|
-
this.apiUrl = apiUrl;
|
|
15
15
|
this.homeService = homeService;
|
|
16
|
+
this.apiUrl = apiUrl;
|
|
16
17
|
}
|
|
17
|
-
|
|
18
|
-
|
|
18
|
+
getMensShippingMethods(zip, weightGrams, totalPrice, personId, shop, subscriptionPlan) {
|
|
19
|
+
combineLatest([
|
|
19
20
|
this.homeService.getHomeData(),
|
|
20
21
|
this.http.get(`${this.apiUrl}open/checkshippingcompany?personId=${personId}&postalCode=${zip}&weightGrams=${weightGrams}`)
|
|
21
|
-
])
|
|
22
|
-
|
|
23
|
-
|
|
22
|
+
]).pipe(map((datas, shippings) => console.log('combineLatest', datas, shippings)));
|
|
23
|
+
return this.http.get(`${this.apiUrl}open/checkshippingcompany?personId=${personId}&postalCode=${zip}&weightGrams=${weightGrams}`)
|
|
24
|
+
.pipe(map((data) => data.result), map((shippingMethods) => __awaiter(this, void 0, void 0, function* () {
|
|
25
|
+
let shippingMethodsResponse = shippingMethods;
|
|
26
|
+
console.log('shippingMethods', shippingMethods);
|
|
24
27
|
if (!shippingMethods.length)
|
|
25
28
|
return [];
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
else
|
|
30
|
-
return s;
|
|
31
|
-
});
|
|
32
|
-
const datasSameDayNotAvaliable = datas.sameDayNotAvaliable;
|
|
33
|
-
if (this.isHolidays(datasSameDayNotAvaliable)) {
|
|
34
|
-
shippingMethods = shippingMethods.filter((method) => method.ShippingCompanyName !== 'Same Day');
|
|
29
|
+
const datas = yield this.homeService.getHomeData().toPromise().then((data) => data.sameDayNotAvaliable);
|
|
30
|
+
if (this.isHolidays(datas)) {
|
|
31
|
+
shippingMethodsResponse = shippingMethods.filter((method) => method.ShippingCompanyName !== 'Same Day');
|
|
35
32
|
}
|
|
36
|
-
if (totalPrice >= 200) {
|
|
37
|
-
|
|
33
|
+
if (totalPrice >= 200 || this.isFreeShippingBySubscription(shop, subscriptionPlan)) {
|
|
34
|
+
return shippingMethodsResponse.map(s => {
|
|
38
35
|
if (s.serviceName !== 'Same Day')
|
|
39
36
|
return Object.assign(Object.assign({}, s), { totalPrice: 0 });
|
|
40
37
|
else
|
|
41
38
|
return s;
|
|
42
39
|
});
|
|
43
40
|
}
|
|
44
|
-
if (shop == Shops.GLAMSHOP)
|
|
45
|
-
return shippingMethods;
|
|
46
41
|
if (this.isFreeShippingBySubscription(shop, subscriptionPlan)) {
|
|
47
|
-
|
|
48
|
-
if (s.serviceName
|
|
42
|
+
return shippingMethodsResponse.map(s => {
|
|
43
|
+
if (s.serviceName !== 'Same Day')
|
|
49
44
|
return Object.assign(Object.assign({}, s), { totalPrice: s.totalPrice / 2 });
|
|
50
45
|
else
|
|
51
|
-
return
|
|
52
|
-
});
|
|
53
|
-
}
|
|
54
|
-
if (this.isHalfShippingBySubscription(shop, subscriptionPlan)) {
|
|
55
|
-
shippingMethods = shippingMethods.map(s => {
|
|
56
|
-
return Object.assign(Object.assign({}, s), { totalPrice: s.totalPrice / 2 });
|
|
46
|
+
return s;
|
|
57
47
|
});
|
|
58
48
|
}
|
|
59
|
-
return
|
|
60
|
-
}));
|
|
49
|
+
return shippingMethodsResponse;
|
|
50
|
+
})));
|
|
61
51
|
}
|
|
62
52
|
isFreeShippingBySubscription(shop, subscriptionPlan) {
|
|
63
53
|
if (!subscriptionPlan)
|
|
@@ -73,9 +63,6 @@ export class ShippingService {
|
|
|
73
63
|
if (shop == Shops.MENSMARKET && subscriptionPlan == 'PRIME') {
|
|
74
64
|
return true;
|
|
75
65
|
}
|
|
76
|
-
if (shop == Shops.GLAMSHOP && subscriptionPlan) {
|
|
77
|
-
return true;
|
|
78
|
-
}
|
|
79
66
|
return false;
|
|
80
67
|
}
|
|
81
68
|
isHolidays(datas) {
|
|
@@ -91,12 +78,12 @@ export class ShippingService {
|
|
|
91
78
|
return false;
|
|
92
79
|
}
|
|
93
80
|
}
|
|
94
|
-
ShippingService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.12", ngImport: i0, type: ShippingService, deps: [{ token: i1.HttpClient }, { token:
|
|
81
|
+
ShippingService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.12", ngImport: i0, type: ShippingService, deps: [{ token: i1.HttpClient }, { token: i2.HomeShopService }, { token: API_URL }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
95
82
|
ShippingService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.12", ngImport: i0, type: ShippingService });
|
|
96
83
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.12", ngImport: i0, type: ShippingService, decorators: [{
|
|
97
84
|
type: Injectable
|
|
98
|
-
}], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: undefined, decorators: [{
|
|
85
|
+
}], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: i2.HomeShopService }, { type: undefined, decorators: [{
|
|
99
86
|
type: Inject,
|
|
100
|
-
args: [
|
|
101
|
-
}] }
|
|
102
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
87
|
+
args: [API_URL]
|
|
88
|
+
}] }]; } });
|
|
89
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"shipping.service.js","sourceRoot":"","sources":["../../../../projects/connect-angular/src/services/shipping.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { HttpClient } from '@angular/common/http';\r\nimport { Inject, Injectable } from '@angular/core';\r\nimport { Shops } from '@infrab4a/connect/src';\r\nimport { combineLatest } from 'rxjs';\r\nimport { map } from 'rxjs/operators';\r\nimport { API_URL } from '../consts';\r\nimport { HomeShopService } from './home-shop.service';\r\nimport { ShippingMethodResponse } from './types/shipping-methods.type';\r\n\r\n@Injectable()\r\nexport class ShippingService {\r\n\r\n  constructor(\r\n   private http: HttpClient,\r\n   private homeService: HomeShopService,\r\n   @Inject(API_URL) private apiUrl: string\r\n  ) {}\r\n\r\n  public getMensShippingMethods(\r\n    zip: string,\r\n    weightGrams: number,\r\n    totalPrice: number,\r\n    personId: string,\r\n    shop: string,\r\n    subscriptionPlan?: string\r\n  ) {\r\n\r\n    combineLatest([\r\n      this.homeService.getHomeData(),\r\n      this.http.get(`${this.apiUrl}open/checkshippingcompany?personId=${personId}&postalCode=${zip}&weightGrams=${weightGrams}`)\r\n    ]).pipe(\r\n      map((datas, shippings) => console.log('combineLatest', datas, shippings))\r\n    )\r\n\r\n    return this.http.get(\r\n      `${this.apiUrl}open/checkshippingcompany?personId=${personId}&postalCode=${zip}&weightGrams=${weightGrams}`\r\n    )\r\n    .pipe(\r\n      map((data: any) => data.result),\r\n      map(async (shippingMethods: (ShippingMethodResponse & { ShippingCompanyName?: string })[]) => {\r\n        let shippingMethodsResponse = shippingMethods\r\n        console.log('shippingMethods', shippingMethods)\r\n        if (!shippingMethods.length) return []\r\n        \r\n        const datas = await this.homeService.getHomeData().toPromise().then((data: any) => data.sameDayNotAvaliable)\r\n\r\n        if (this.isHolidays(datas)) {\r\n          shippingMethodsResponse = shippingMethods.filter(\r\n            (method) => method.ShippingCompanyName !== 'Same Day'\r\n          );\r\n        }\r\n\r\n        if (totalPrice >= 200 || this.isFreeShippingBySubscription(shop, subscriptionPlan)) {\r\n          return shippingMethodsResponse.map(s => {\r\n            if (s.serviceName !== 'Same Day') return { ...s, totalPrice: 0 }\r\n            else return s\r\n          })\r\n        }\r\n\r\n        if (this.isFreeShippingBySubscription(shop, subscriptionPlan)) {\r\n          return shippingMethodsResponse.map(s => {\r\n            if (s.serviceName !== 'Same Day') return { ...s, totalPrice: s.totalPrice/2 }\r\n            else return s\r\n          })\r\n        }\r\n\r\n        return shippingMethodsResponse\r\n      })\r\n    )\r\n  \r\n  }\r\n\r\n  private isFreeShippingBySubscription(shop: string, subscriptionPlan: string): boolean {\r\n    if(!subscriptionPlan) return false\r\n\r\n    if (shop == Shops.MENSMARKET && subscriptionPlan == 'SELECT') {\r\n      return true\r\n    }\r\n    \r\n    return false\r\n  }\r\n\r\n  private isHalfShippingBySubscription(shop: string, subscriptionPlan: string) {\r\n    if(!subscriptionPlan) return false\r\n\r\n    if (shop == Shops.MENSMARKET && subscriptionPlan == 'PRIME') {\r\n      return true\r\n    }\r\n    \r\n    return false\r\n  }\r\n\r\n   private isHolidays(datas: any): boolean {\r\n    const today = new Date()\r\n\r\n    for (const key in datas) {\r\n      let start = new Date(`${today.getFullYear()}-${datas[key].beginDate}`)\r\n      let end = new Date(`${today.getFullYear()}-${datas[key].endDate}`)\r\n\r\n      if (start > end)\r\n        end = new Date(`${today.getFullYear() + 1}-${datas[key].endDate}`)\r\n\r\n      if (today >= start && today <= end)\r\n        return true\r\n    }\r\n\r\n    return false\r\n  }\r\n\r\n}"]}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export {};
|
|
2
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
2
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2hpcHBpbmctbWV0aG9kcy50eXBlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvY29ubmVjdC1hbmd1bGFyL3NyYy9zZXJ2aWNlcy90eXBlcy9zaGlwcGluZy1tZXRob2RzLnR5cGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiIsInNvdXJjZXNDb250ZW50IjpbImV4cG9ydCBpbnRlcmZhY2UgU2hpcHBpbmdNZXRob2RSZXNwb25zZSB7XHJcbiAgRGF5c1RvRGVsaXZlcnk6IG51bWJlcjtcclxuICBjdXJyZW5jeTogc3RyaW5nO1xyXG4gIGRlc2NyaXB0aW9uOiBzdHJpbmc7XHJcbiAgbWF4RGVsaXZlcnlEYXRlOiBzdHJpbmc7XHJcbiAgbWluRGVsaXZlcnlEYXRlOiBzdHJpbmc7XHJcbiAgc2VydmljZUNvZGU6IHN0cmluZztcclxuICBzZXJ2aWNlTmFtZTogc3RyaW5nO1xyXG4gIHRvdGFsUHJpY2U6IG51bWJlcjtcclxuICBhZGRpdGlvbmFsRGVzY3JpcHRpb246IHN0cmluZztcclxuICBjbnBqOiBzdHJpbmc7XHJcbn0iXX0=
|
|
@@ -12,6 +12,7 @@ import { CustomError } from 'ts-custom-error';
|
|
|
12
12
|
import * as i1$2 from '@angular/fire/firestore';
|
|
13
13
|
import { AngularFirestore } from '@angular/fire/firestore';
|
|
14
14
|
import * as i1$3 from '@angular/common/http';
|
|
15
|
+
import { Shops as Shops$1 } from '@infrab4a/connect/src';
|
|
15
16
|
import { FIREBASE_OPTIONS, FIREBASE_APP_NAME, AngularFireModule } from '@angular/fire';
|
|
16
17
|
|
|
17
18
|
class AuthService {
|
|
@@ -50,7 +51,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.12", ngImpo
|
|
|
50
51
|
args: ['UserRepository']
|
|
51
52
|
}] }]; } });
|
|
52
53
|
|
|
53
|
-
const
|
|
54
|
+
const API_URL = 'API_URL';
|
|
54
55
|
|
|
55
56
|
const DEFAULT_SHOP = 'DEFAULT_SHOP';
|
|
56
57
|
|
|
@@ -705,60 +706,49 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.12", ngImpo
|
|
|
705
706
|
}] }]; } });
|
|
706
707
|
|
|
707
708
|
class ShippingService {
|
|
708
|
-
constructor(http,
|
|
709
|
+
constructor(http, homeService, apiUrl) {
|
|
709
710
|
this.http = http;
|
|
710
|
-
this.apiUrl = apiUrl;
|
|
711
711
|
this.homeService = homeService;
|
|
712
|
+
this.apiUrl = apiUrl;
|
|
712
713
|
}
|
|
713
|
-
|
|
714
|
-
|
|
714
|
+
getMensShippingMethods(zip, weightGrams, totalPrice, personId, shop, subscriptionPlan) {
|
|
715
|
+
combineLatest([
|
|
715
716
|
this.homeService.getHomeData(),
|
|
716
717
|
this.http.get(`${this.apiUrl}open/checkshippingcompany?personId=${personId}&postalCode=${zip}&weightGrams=${weightGrams}`)
|
|
717
|
-
])
|
|
718
|
-
|
|
719
|
-
|
|
718
|
+
]).pipe(map((datas, shippings) => console.log('combineLatest', datas, shippings)));
|
|
719
|
+
return this.http.get(`${this.apiUrl}open/checkshippingcompany?personId=${personId}&postalCode=${zip}&weightGrams=${weightGrams}`)
|
|
720
|
+
.pipe(map((data) => data.result), map((shippingMethods) => __awaiter(this, void 0, void 0, function* () {
|
|
721
|
+
let shippingMethodsResponse = shippingMethods;
|
|
722
|
+
console.log('shippingMethods', shippingMethods);
|
|
720
723
|
if (!shippingMethods.length)
|
|
721
724
|
return [];
|
|
722
|
-
|
|
723
|
-
|
|
724
|
-
|
|
725
|
-
else
|
|
726
|
-
return s;
|
|
727
|
-
});
|
|
728
|
-
const datasSameDayNotAvaliable = datas.sameDayNotAvaliable;
|
|
729
|
-
if (this.isHolidays(datasSameDayNotAvaliable)) {
|
|
730
|
-
shippingMethods = shippingMethods.filter((method) => method.ShippingCompanyName !== 'Same Day');
|
|
725
|
+
const datas = yield this.homeService.getHomeData().toPromise().then((data) => data.sameDayNotAvaliable);
|
|
726
|
+
if (this.isHolidays(datas)) {
|
|
727
|
+
shippingMethodsResponse = shippingMethods.filter((method) => method.ShippingCompanyName !== 'Same Day');
|
|
731
728
|
}
|
|
732
|
-
if (totalPrice >= 200) {
|
|
733
|
-
|
|
729
|
+
if (totalPrice >= 200 || this.isFreeShippingBySubscription(shop, subscriptionPlan)) {
|
|
730
|
+
return shippingMethodsResponse.map(s => {
|
|
734
731
|
if (s.serviceName !== 'Same Day')
|
|
735
732
|
return Object.assign(Object.assign({}, s), { totalPrice: 0 });
|
|
736
733
|
else
|
|
737
734
|
return s;
|
|
738
735
|
});
|
|
739
736
|
}
|
|
740
|
-
if (shop == Shops.GLAMSHOP)
|
|
741
|
-
return shippingMethods;
|
|
742
737
|
if (this.isFreeShippingBySubscription(shop, subscriptionPlan)) {
|
|
743
|
-
|
|
744
|
-
if (s.serviceName
|
|
738
|
+
return shippingMethodsResponse.map(s => {
|
|
739
|
+
if (s.serviceName !== 'Same Day')
|
|
745
740
|
return Object.assign(Object.assign({}, s), { totalPrice: s.totalPrice / 2 });
|
|
746
741
|
else
|
|
747
|
-
return
|
|
748
|
-
});
|
|
749
|
-
}
|
|
750
|
-
if (this.isHalfShippingBySubscription(shop, subscriptionPlan)) {
|
|
751
|
-
shippingMethods = shippingMethods.map(s => {
|
|
752
|
-
return Object.assign(Object.assign({}, s), { totalPrice: s.totalPrice / 2 });
|
|
742
|
+
return s;
|
|
753
743
|
});
|
|
754
744
|
}
|
|
755
|
-
return
|
|
756
|
-
}));
|
|
745
|
+
return shippingMethodsResponse;
|
|
746
|
+
})));
|
|
757
747
|
}
|
|
758
748
|
isFreeShippingBySubscription(shop, subscriptionPlan) {
|
|
759
749
|
if (!subscriptionPlan)
|
|
760
750
|
return false;
|
|
761
|
-
if (shop == Shops.MENSMARKET && subscriptionPlan == 'SELECT') {
|
|
751
|
+
if (shop == Shops$1.MENSMARKET && subscriptionPlan == 'SELECT') {
|
|
762
752
|
return true;
|
|
763
753
|
}
|
|
764
754
|
return false;
|
|
@@ -766,10 +756,7 @@ class ShippingService {
|
|
|
766
756
|
isHalfShippingBySubscription(shop, subscriptionPlan) {
|
|
767
757
|
if (!subscriptionPlan)
|
|
768
758
|
return false;
|
|
769
|
-
if (shop == Shops.MENSMARKET && subscriptionPlan == 'PRIME') {
|
|
770
|
-
return true;
|
|
771
|
-
}
|
|
772
|
-
if (shop == Shops.GLAMSHOP && subscriptionPlan) {
|
|
759
|
+
if (shop == Shops$1.MENSMARKET && subscriptionPlan == 'PRIME') {
|
|
773
760
|
return true;
|
|
774
761
|
}
|
|
775
762
|
return false;
|
|
@@ -787,14 +774,14 @@ class ShippingService {
|
|
|
787
774
|
return false;
|
|
788
775
|
}
|
|
789
776
|
}
|
|
790
|
-
ShippingService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.12", ngImport: i0, type: ShippingService, deps: [{ token: i1$3.HttpClient }, { token:
|
|
777
|
+
ShippingService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.12", ngImport: i0, type: ShippingService, deps: [{ token: i1$3.HttpClient }, { token: HomeShopService }, { token: API_URL }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
791
778
|
ShippingService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.12", ngImport: i0, type: ShippingService });
|
|
792
779
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.12", ngImport: i0, type: ShippingService, decorators: [{
|
|
793
780
|
type: Injectable
|
|
794
|
-
}], ctorParameters: function () { return [{ type: i1$3.HttpClient }, { type: undefined, decorators: [{
|
|
781
|
+
}], ctorParameters: function () { return [{ type: i1$3.HttpClient }, { type: HomeShopService }, { type: undefined, decorators: [{
|
|
795
782
|
type: Inject,
|
|
796
|
-
args: [
|
|
797
|
-
}] }
|
|
783
|
+
args: [API_URL]
|
|
784
|
+
}] }]; } });
|
|
798
785
|
|
|
799
786
|
class AngularFirebaseAuthModule {
|
|
800
787
|
static initializeApp(options, nameOrConfig) {
|
|
@@ -1379,7 +1366,7 @@ class AngularConnectModule {
|
|
|
1379
1366
|
...(isNil(options === null || options === void 0 ? void 0 : options.firebase) ? [] : [{ provide: FIREBASE_APP_NAME, useValue: nameOrConfig }]),
|
|
1380
1367
|
...(isNil(options === null || options === void 0 ? void 0 : options.elasticSearch) ? [] : [{ provide: ES_CONFIG, useValue: options.elasticSearch }]),
|
|
1381
1368
|
...(isNil(options === null || options === void 0 ? void 0 : options.hasura) ? [] : [{ provide: HASURA_OPTIONS, useValue: options.hasura }]),
|
|
1382
|
-
...(isNil(options === null || options === void 0 ? void 0 : options.
|
|
1369
|
+
...(isNil(options === null || options === void 0 ? void 0 : options.apiUrl) ? [] : [{ provide: API_URL, useValue: options.apiUrl }]),
|
|
1383
1370
|
],
|
|
1384
1371
|
};
|
|
1385
1372
|
}
|