@infrab4a/connect-angular 3.4.0-beta.5 → 3.4.0-beta.7
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/bundles/infrab4a-connect-angular.umd.js +45 -49
- package/bundles/infrab4a-connect-angular.umd.js.map +1 -1
- package/esm2015/services/shipping.service.js +27 -28
- package/esm2015/services/types/shipping-methods.type.js +1 -1
- package/fesm2015/infrab4a-connect-angular.js +25 -29
- package/fesm2015/infrab4a-connect-angular.js.map +1 -1
- package/package.json +2 -2
- package/services/shipping.service.d.ts +6 -3
- package/services/types/shipping-methods.type.d.ts +1 -1
|
@@ -1,54 +1,50 @@
|
|
|
1
|
-
import { __awaiter } from "tslib";
|
|
2
1
|
import { HttpClient } from '@angular/common/http';
|
|
3
2
|
import { Inject, Injectable } from '@angular/core';
|
|
4
|
-
import { Shops } from '@infrab4a/connect
|
|
3
|
+
import { Shops } from '@infrab4a/connect';
|
|
4
|
+
import { combineLatest } from 'rxjs';
|
|
5
5
|
import { map } from 'rxjs/operators';
|
|
6
6
|
import { API_URL } from '../consts';
|
|
7
|
+
import { HomeShopService } from './home-shop.service';
|
|
7
8
|
import * as i0 from "@angular/core";
|
|
8
9
|
import * as i1 from "@angular/common/http";
|
|
10
|
+
import * as i2 from "./home-shop.service";
|
|
9
11
|
export class ShippingService {
|
|
10
|
-
constructor(http,
|
|
11
|
-
// private homeService: HomeShopService,
|
|
12
|
-
apiUrl) {
|
|
12
|
+
constructor(http, apiUrl, homeService) {
|
|
13
13
|
this.http = http;
|
|
14
14
|
this.apiUrl = apiUrl;
|
|
15
|
+
this.homeService = homeService;
|
|
15
16
|
}
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
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);
|
|
17
|
+
getShippingMethods(shop, zip, weightGrams, totalPrice, personId, subscriptionPlan) {
|
|
18
|
+
return combineLatest([
|
|
19
|
+
this.homeService.getHomeData(),
|
|
20
|
+
this.http.get(`${this.apiUrl}open/checkshippingcompany?personId=${personId}&postalCode=${zip}&weightGrams=${weightGrams}`)
|
|
21
|
+
])
|
|
22
|
+
.pipe(map(([datas, shippingMethodsResponse]) => {
|
|
23
|
+
let shippingMethods = shippingMethodsResponse.result;
|
|
27
24
|
if (!shippingMethods.length)
|
|
28
25
|
return [];
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
shippingMethodsResponse = shippingMethods.filter((method) => method.ShippingCompanyName !== 'Same Day');
|
|
26
|
+
const datasSameDayNotAvaliable = datas.sameDayNotAvaliable;
|
|
27
|
+
if (this.isHolidays(datasSameDayNotAvaliable)) {
|
|
28
|
+
shippingMethods = shippingMethods.filter((method) => method.ShippingCompanyName !== 'Same Day');
|
|
33
29
|
}
|
|
34
30
|
if (totalPrice >= 200 || this.isFreeShippingBySubscription(shop, subscriptionPlan)) {
|
|
35
|
-
return
|
|
31
|
+
return shippingMethods.map(s => {
|
|
36
32
|
if (s.serviceName !== 'Same Day')
|
|
37
33
|
return Object.assign(Object.assign({}, s), { totalPrice: 0 });
|
|
38
34
|
else
|
|
39
35
|
return s;
|
|
40
36
|
});
|
|
41
37
|
}
|
|
42
|
-
if (this.
|
|
43
|
-
return
|
|
38
|
+
if (this.isHalfShippingBySubscription(shop, subscriptionPlan)) {
|
|
39
|
+
return shippingMethods.map(s => {
|
|
44
40
|
if (s.serviceName !== 'Same Day')
|
|
45
41
|
return Object.assign(Object.assign({}, s), { totalPrice: s.totalPrice / 2 });
|
|
46
42
|
else
|
|
47
43
|
return s;
|
|
48
44
|
});
|
|
49
45
|
}
|
|
50
|
-
return
|
|
51
|
-
}))
|
|
46
|
+
return shippingMethods;
|
|
47
|
+
}));
|
|
52
48
|
}
|
|
53
49
|
isFreeShippingBySubscription(shop, subscriptionPlan) {
|
|
54
50
|
if (!subscriptionPlan)
|
|
@@ -64,6 +60,9 @@ export class ShippingService {
|
|
|
64
60
|
if (shop == Shops.MENSMARKET && subscriptionPlan == 'PRIME') {
|
|
65
61
|
return true;
|
|
66
62
|
}
|
|
63
|
+
if (shop == Shops.GLAMSHOP && subscriptionPlan) {
|
|
64
|
+
return true;
|
|
65
|
+
}
|
|
67
66
|
return false;
|
|
68
67
|
}
|
|
69
68
|
isHolidays(datas) {
|
|
@@ -79,12 +78,12 @@ export class ShippingService {
|
|
|
79
78
|
return false;
|
|
80
79
|
}
|
|
81
80
|
}
|
|
82
|
-
ShippingService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.12", ngImport: i0, type: ShippingService, deps: [{ token: i1.HttpClient }, { token: API_URL }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
81
|
+
ShippingService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.12", ngImport: i0, type: ShippingService, deps: [{ token: i1.HttpClient }, { token: API_URL }, { token: i2.HomeShopService }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
83
82
|
ShippingService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.12", ngImport: i0, type: ShippingService });
|
|
84
83
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.12", ngImport: i0, type: ShippingService, decorators: [{
|
|
85
84
|
type: Injectable
|
|
86
85
|
}], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: undefined, decorators: [{
|
|
87
86
|
type: Inject,
|
|
88
87
|
args: [API_URL]
|
|
89
|
-
}] }]; } });
|
|
90
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
88
|
+
}] }, { type: i2.HomeShopService }]; } });
|
|
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":["\r\nimport { HttpClient } from '@angular/common/http';\r\nimport { Inject, Injectable } from '@angular/core';\r\nimport { Home, Shops } from '@infrab4a/connect';\r\nimport { combineLatest, Observable } from 'rxjs';\r\nimport { map } from 'rxjs/operators';\r\n\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    @Inject(API_URL) private apiUrl: string,\r\n    private homeService: HomeShopService,\r\n  ) {}\r\n\r\n  public getShippingMethods(\r\n    shop: string,\r\n    zip: string,\r\n    weightGrams: number,\r\n    totalPrice: number,\r\n    personId: string,\r\n    subscriptionPlan?: string\r\n  ): Observable<Array<ShippingMethodResponse & { ShippingCompanyName?: string }>> {\r\n\r\n    return combineLatest([\r\n      this.homeService.getHomeData(),\r\n      this.http.get(`${this.apiUrl}open/checkshippingcompany?personId=${personId}&postalCode=${zip}&weightGrams=${weightGrams}`)\r\n    ])\r\n    .pipe(\r\n      map( ([datas, shippingMethodsResponse]: [Home & {sameDayNotAvaliable}, any])=> {\r\n        let shippingMethods = shippingMethodsResponse.result as (ShippingMethodResponse & { ShippingCompanyName?: string })[]\r\n\r\n        if (!shippingMethods.length) return []\r\n        \r\n        const datasSameDayNotAvaliable = datas.sameDayNotAvaliable\r\n\r\n        if (this.isHolidays(datasSameDayNotAvaliable)) {\r\n          shippingMethods = 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 shippingMethods.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.isHalfShippingBySubscription(shop, subscriptionPlan)) {\r\n          return shippingMethods.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 shippingMethods\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    if (shop == Shops.GLAMSHOP && subscriptionPlan) {\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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2hpcHBpbmctbWV0aG9kcy50eXBlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vcHJvamVjdHMvY29ubmVjdC1hbmd1bGFyL3NyYy9zZXJ2aWNlcy90eXBlcy9zaGlwcGluZy1tZXRob2RzLnR5cGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiIsInNvdXJjZXNDb250ZW50IjpbImV4cG9ydCBpbnRlcmZhY2UgU2hpcHBpbmdNZXRob2RSZXNwb25zZSB7XHJcbiAgZGF5c1RvRGVsaXZlcnk6IG51bWJlcjtcclxuICBjdXJyZW5jeTogc3RyaW5nO1xyXG4gIGRlc2NyaXB0aW9uOiBzdHJpbmc7XHJcbiAgbWF4RGVsaXZlcnlEYXRlOiBzdHJpbmc7XHJcbiAgbWluRGVsaXZlcnlEYXRlOiBzdHJpbmc7XHJcbiAgc2VydmljZUNvZGU6IHN0cmluZztcclxuICBzZXJ2aWNlTmFtZTogc3RyaW5nO1xyXG4gIHRvdGFsUHJpY2U6IG51bWJlcjtcclxuICBhZGRpdGlvbmFsRGVzY3JpcHRpb246IHN0cmluZztcclxuICBjbnBqOiBzdHJpbmc7XHJcbn0iXX0=
|
|
@@ -12,7 +12,6 @@ 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';
|
|
16
15
|
import { FIREBASE_OPTIONS, FIREBASE_APP_NAME, AngularFireModule } from '@angular/fire';
|
|
17
16
|
|
|
18
17
|
class AuthService {
|
|
@@ -706,53 +705,47 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.12", ngImpo
|
|
|
706
705
|
}] }]; } });
|
|
707
706
|
|
|
708
707
|
class ShippingService {
|
|
709
|
-
constructor(http,
|
|
710
|
-
// private homeService: HomeShopService,
|
|
711
|
-
apiUrl) {
|
|
708
|
+
constructor(http, apiUrl, homeService) {
|
|
712
709
|
this.http = http;
|
|
713
710
|
this.apiUrl = apiUrl;
|
|
714
|
-
|
|
715
|
-
|
|
716
|
-
|
|
717
|
-
|
|
718
|
-
|
|
719
|
-
|
|
720
|
-
|
|
721
|
-
|
|
722
|
-
|
|
723
|
-
.pipe(map((data) => data.result), map((shippingMethods) => __awaiter(this, void 0, void 0, function* () {
|
|
724
|
-
let shippingMethodsResponse = shippingMethods;
|
|
725
|
-
console.log('shippingMethods', shippingMethods);
|
|
711
|
+
this.homeService = homeService;
|
|
712
|
+
}
|
|
713
|
+
getShippingMethods(shop, zip, weightGrams, totalPrice, personId, subscriptionPlan) {
|
|
714
|
+
return combineLatest([
|
|
715
|
+
this.homeService.getHomeData(),
|
|
716
|
+
this.http.get(`${this.apiUrl}open/checkshippingcompany?personId=${personId}&postalCode=${zip}&weightGrams=${weightGrams}`)
|
|
717
|
+
])
|
|
718
|
+
.pipe(map(([datas, shippingMethodsResponse]) => {
|
|
719
|
+
let shippingMethods = shippingMethodsResponse.result;
|
|
726
720
|
if (!shippingMethods.length)
|
|
727
721
|
return [];
|
|
728
|
-
|
|
729
|
-
|
|
730
|
-
|
|
731
|
-
shippingMethodsResponse = shippingMethods.filter((method) => method.ShippingCompanyName !== 'Same Day');
|
|
722
|
+
const datasSameDayNotAvaliable = datas.sameDayNotAvaliable;
|
|
723
|
+
if (this.isHolidays(datasSameDayNotAvaliable)) {
|
|
724
|
+
shippingMethods = shippingMethods.filter((method) => method.ShippingCompanyName !== 'Same Day');
|
|
732
725
|
}
|
|
733
726
|
if (totalPrice >= 200 || this.isFreeShippingBySubscription(shop, subscriptionPlan)) {
|
|
734
|
-
return
|
|
727
|
+
return shippingMethods.map(s => {
|
|
735
728
|
if (s.serviceName !== 'Same Day')
|
|
736
729
|
return Object.assign(Object.assign({}, s), { totalPrice: 0 });
|
|
737
730
|
else
|
|
738
731
|
return s;
|
|
739
732
|
});
|
|
740
733
|
}
|
|
741
|
-
if (this.
|
|
742
|
-
return
|
|
734
|
+
if (this.isHalfShippingBySubscription(shop, subscriptionPlan)) {
|
|
735
|
+
return shippingMethods.map(s => {
|
|
743
736
|
if (s.serviceName !== 'Same Day')
|
|
744
737
|
return Object.assign(Object.assign({}, s), { totalPrice: s.totalPrice / 2 });
|
|
745
738
|
else
|
|
746
739
|
return s;
|
|
747
740
|
});
|
|
748
741
|
}
|
|
749
|
-
return
|
|
750
|
-
}))
|
|
742
|
+
return shippingMethods;
|
|
743
|
+
}));
|
|
751
744
|
}
|
|
752
745
|
isFreeShippingBySubscription(shop, subscriptionPlan) {
|
|
753
746
|
if (!subscriptionPlan)
|
|
754
747
|
return false;
|
|
755
|
-
if (shop == Shops
|
|
748
|
+
if (shop == Shops.MENSMARKET && subscriptionPlan == 'SELECT') {
|
|
756
749
|
return true;
|
|
757
750
|
}
|
|
758
751
|
return false;
|
|
@@ -760,7 +753,10 @@ class ShippingService {
|
|
|
760
753
|
isHalfShippingBySubscription(shop, subscriptionPlan) {
|
|
761
754
|
if (!subscriptionPlan)
|
|
762
755
|
return false;
|
|
763
|
-
if (shop == Shops
|
|
756
|
+
if (shop == Shops.MENSMARKET && subscriptionPlan == 'PRIME') {
|
|
757
|
+
return true;
|
|
758
|
+
}
|
|
759
|
+
if (shop == Shops.GLAMSHOP && subscriptionPlan) {
|
|
764
760
|
return true;
|
|
765
761
|
}
|
|
766
762
|
return false;
|
|
@@ -778,14 +774,14 @@ class ShippingService {
|
|
|
778
774
|
return false;
|
|
779
775
|
}
|
|
780
776
|
}
|
|
781
|
-
ShippingService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.12", ngImport: i0, type: ShippingService, deps: [{ token: i1$3.HttpClient }, { token: API_URL }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
777
|
+
ShippingService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.12", ngImport: i0, type: ShippingService, deps: [{ token: i1$3.HttpClient }, { token: API_URL }, { token: HomeShopService }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
782
778
|
ShippingService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.12", ngImport: i0, type: ShippingService });
|
|
783
779
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.12", ngImport: i0, type: ShippingService, decorators: [{
|
|
784
780
|
type: Injectable
|
|
785
781
|
}], ctorParameters: function () { return [{ type: i1$3.HttpClient }, { type: undefined, decorators: [{
|
|
786
782
|
type: Inject,
|
|
787
783
|
args: [API_URL]
|
|
788
|
-
}] }]; } });
|
|
784
|
+
}] }, { type: HomeShopService }]; } });
|
|
789
785
|
|
|
790
786
|
class AngularFirebaseAuthModule {
|
|
791
787
|
static initializeApp(options, nameOrConfig) {
|