@infrab4a/connect-angular 3.4.0-beta.2 → 3.4.0-beta.4
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 +77 -38
- package/bundles/infrab4a-connect-angular.umd.js.map +1 -1
- package/esm2015/services/shipping.service.js +54 -19
- package/fesm2015/infrab4a-connect-angular.js +49 -18
- package/fesm2015/infrab4a-connect-angular.js.map +1 -1
- package/package.json +1 -1
- package/services/shipping.service.d.ts +10 -2
|
@@ -1,38 +1,45 @@
|
|
|
1
|
+
import { __awaiter } from "tslib";
|
|
1
2
|
import { HttpClient } from '@angular/common/http';
|
|
2
3
|
import { Inject, Injectable } from '@angular/core';
|
|
4
|
+
import { Shops } from '@infrab4a/connect/src';
|
|
5
|
+
import { combineLatest } from 'rxjs';
|
|
3
6
|
import { map } from 'rxjs/operators';
|
|
4
7
|
import { API_URL } from '../consts';
|
|
8
|
+
import { HomeShopService } from './home-shop.service';
|
|
5
9
|
import * as i0 from "@angular/core";
|
|
6
10
|
import * as i1 from "@angular/common/http";
|
|
11
|
+
import * as i2 from "./home-shop.service";
|
|
7
12
|
export class ShippingService {
|
|
8
|
-
constructor(http, apiUrl) {
|
|
13
|
+
constructor(http, homeService, apiUrl) {
|
|
9
14
|
this.http = http;
|
|
15
|
+
this.homeService = homeService;
|
|
10
16
|
this.apiUrl = apiUrl;
|
|
11
17
|
}
|
|
12
|
-
getMensShippingMethods(zip, weightGrams, totalPrice, personId, subscriptionPlan) {
|
|
18
|
+
getMensShippingMethods(zip, weightGrams, totalPrice, personId, shop, subscriptionPlan) {
|
|
19
|
+
combineLatest([
|
|
20
|
+
this.homeService.getHomeData(),
|
|
21
|
+
this.http.get(`${this.apiUrl}open/checkshippingcompany?personId=${personId}&postalCode=${zip}&weightGrams=${weightGrams}`)
|
|
22
|
+
]).pipe(map((datas, shippings) => console.log('combineLatest', datas, shippings)));
|
|
13
23
|
return this.http.get(`${this.apiUrl}open/checkshippingcompany?personId=${personId}&postalCode=${zip}&weightGrams=${weightGrams}`)
|
|
14
|
-
.pipe(map((data) => data.result), map((shippingMethods) => {
|
|
15
|
-
|
|
24
|
+
.pipe(map((data) => data.result), map((shippingMethods) => __awaiter(this, void 0, void 0, function* () {
|
|
25
|
+
let shippingMethodsResponse = shippingMethods;
|
|
26
|
+
console.log('shippingMethods', shippingMethods);
|
|
16
27
|
if (!shippingMethods.length)
|
|
17
28
|
return [];
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
return Object.assign(Object.assign({}, s), { totalPrice: 0 });
|
|
22
|
-
else
|
|
23
|
-
return s;
|
|
24
|
-
});
|
|
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');
|
|
25
32
|
}
|
|
26
|
-
if (
|
|
27
|
-
return
|
|
33
|
+
if (totalPrice >= 200 || this.isFreeShippingBySubscription(shop, subscriptionPlan)) {
|
|
34
|
+
return shippingMethodsResponse.map(s => {
|
|
28
35
|
if (s.serviceName !== 'Same Day')
|
|
29
36
|
return Object.assign(Object.assign({}, s), { totalPrice: 0 });
|
|
30
37
|
else
|
|
31
38
|
return s;
|
|
32
39
|
});
|
|
33
40
|
}
|
|
34
|
-
if (
|
|
35
|
-
return
|
|
41
|
+
if (this.isFreeShippingBySubscription(shop, subscriptionPlan)) {
|
|
42
|
+
return shippingMethodsResponse.map(s => {
|
|
36
43
|
if (s.serviceName !== 'Same Day')
|
|
37
44
|
return Object.assign(Object.assign({}, s), { totalPrice: s.totalPrice / 2 });
|
|
38
45
|
else
|
|
@@ -40,15 +47,43 @@ export class ShippingService {
|
|
|
40
47
|
});
|
|
41
48
|
}
|
|
42
49
|
return shippingMethodsResponse;
|
|
43
|
-
}));
|
|
50
|
+
})));
|
|
51
|
+
}
|
|
52
|
+
isFreeShippingBySubscription(shop, subscriptionPlan) {
|
|
53
|
+
if (!subscriptionPlan)
|
|
54
|
+
return false;
|
|
55
|
+
if (shop == Shops.MENSMARKET && subscriptionPlan == 'SELECT') {
|
|
56
|
+
return true;
|
|
57
|
+
}
|
|
58
|
+
return false;
|
|
59
|
+
}
|
|
60
|
+
isHalfShippingBySubscription(shop, subscriptionPlan) {
|
|
61
|
+
if (!subscriptionPlan)
|
|
62
|
+
return false;
|
|
63
|
+
if (shop == Shops.MENSMARKET && subscriptionPlan == 'PRIME') {
|
|
64
|
+
return true;
|
|
65
|
+
}
|
|
66
|
+
return false;
|
|
67
|
+
}
|
|
68
|
+
isHolidays(datas) {
|
|
69
|
+
const today = new Date();
|
|
70
|
+
for (const key in datas) {
|
|
71
|
+
let start = new Date(`${today.getFullYear()}-${datas[key].beginDate}`);
|
|
72
|
+
let end = new Date(`${today.getFullYear()}-${datas[key].endDate}`);
|
|
73
|
+
if (start > end)
|
|
74
|
+
end = new Date(`${today.getFullYear() + 1}-${datas[key].endDate}`);
|
|
75
|
+
if (today >= start && today <= end)
|
|
76
|
+
return true;
|
|
77
|
+
}
|
|
78
|
+
return false;
|
|
44
79
|
}
|
|
45
80
|
}
|
|
46
|
-
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: i2.HomeShopService }, { token: API_URL }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
47
82
|
ShippingService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.12", ngImport: i0, type: ShippingService });
|
|
48
83
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.12", ngImport: i0, type: ShippingService, decorators: [{
|
|
49
84
|
type: Injectable
|
|
50
|
-
}], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: undefined, decorators: [{
|
|
85
|
+
}], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: i2.HomeShopService }, { type: undefined, decorators: [{
|
|
51
86
|
type: Inject,
|
|
52
87
|
args: [API_URL]
|
|
53
88
|
}] }]; } });
|
|
54
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
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}"]}
|
|
@@ -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 {
|
|
@@ -705,34 +706,36 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.12", ngImpo
|
|
|
705
706
|
}] }]; } });
|
|
706
707
|
|
|
707
708
|
class ShippingService {
|
|
708
|
-
constructor(http, apiUrl) {
|
|
709
|
+
constructor(http, homeService, apiUrl) {
|
|
709
710
|
this.http = http;
|
|
711
|
+
this.homeService = homeService;
|
|
710
712
|
this.apiUrl = apiUrl;
|
|
711
713
|
}
|
|
712
|
-
getMensShippingMethods(zip, weightGrams, totalPrice, personId, subscriptionPlan) {
|
|
714
|
+
getMensShippingMethods(zip, weightGrams, totalPrice, personId, shop, subscriptionPlan) {
|
|
715
|
+
combineLatest([
|
|
716
|
+
this.homeService.getHomeData(),
|
|
717
|
+
this.http.get(`${this.apiUrl}open/checkshippingcompany?personId=${personId}&postalCode=${zip}&weightGrams=${weightGrams}`)
|
|
718
|
+
]).pipe(map((datas, shippings) => console.log('combineLatest', datas, shippings)));
|
|
713
719
|
return this.http.get(`${this.apiUrl}open/checkshippingcompany?personId=${personId}&postalCode=${zip}&weightGrams=${weightGrams}`)
|
|
714
|
-
.pipe(map((data) => data.result), map((shippingMethods) => {
|
|
715
|
-
|
|
720
|
+
.pipe(map((data) => data.result), map((shippingMethods) => __awaiter(this, void 0, void 0, function* () {
|
|
721
|
+
let shippingMethodsResponse = shippingMethods;
|
|
722
|
+
console.log('shippingMethods', shippingMethods);
|
|
716
723
|
if (!shippingMethods.length)
|
|
717
724
|
return [];
|
|
718
|
-
|
|
719
|
-
|
|
720
|
-
|
|
721
|
-
return Object.assign(Object.assign({}, s), { totalPrice: 0 });
|
|
722
|
-
else
|
|
723
|
-
return s;
|
|
724
|
-
});
|
|
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');
|
|
725
728
|
}
|
|
726
|
-
if (
|
|
727
|
-
return
|
|
729
|
+
if (totalPrice >= 200 || this.isFreeShippingBySubscription(shop, subscriptionPlan)) {
|
|
730
|
+
return shippingMethodsResponse.map(s => {
|
|
728
731
|
if (s.serviceName !== 'Same Day')
|
|
729
732
|
return Object.assign(Object.assign({}, s), { totalPrice: 0 });
|
|
730
733
|
else
|
|
731
734
|
return s;
|
|
732
735
|
});
|
|
733
736
|
}
|
|
734
|
-
if (
|
|
735
|
-
return
|
|
737
|
+
if (this.isFreeShippingBySubscription(shop, subscriptionPlan)) {
|
|
738
|
+
return shippingMethodsResponse.map(s => {
|
|
736
739
|
if (s.serviceName !== 'Same Day')
|
|
737
740
|
return Object.assign(Object.assign({}, s), { totalPrice: s.totalPrice / 2 });
|
|
738
741
|
else
|
|
@@ -740,14 +743,42 @@ class ShippingService {
|
|
|
740
743
|
});
|
|
741
744
|
}
|
|
742
745
|
return shippingMethodsResponse;
|
|
743
|
-
}));
|
|
746
|
+
})));
|
|
747
|
+
}
|
|
748
|
+
isFreeShippingBySubscription(shop, subscriptionPlan) {
|
|
749
|
+
if (!subscriptionPlan)
|
|
750
|
+
return false;
|
|
751
|
+
if (shop == Shops$1.MENSMARKET && subscriptionPlan == 'SELECT') {
|
|
752
|
+
return true;
|
|
753
|
+
}
|
|
754
|
+
return false;
|
|
755
|
+
}
|
|
756
|
+
isHalfShippingBySubscription(shop, subscriptionPlan) {
|
|
757
|
+
if (!subscriptionPlan)
|
|
758
|
+
return false;
|
|
759
|
+
if (shop == Shops$1.MENSMARKET && subscriptionPlan == 'PRIME') {
|
|
760
|
+
return true;
|
|
761
|
+
}
|
|
762
|
+
return false;
|
|
763
|
+
}
|
|
764
|
+
isHolidays(datas) {
|
|
765
|
+
const today = new Date();
|
|
766
|
+
for (const key in datas) {
|
|
767
|
+
let start = new Date(`${today.getFullYear()}-${datas[key].beginDate}`);
|
|
768
|
+
let end = new Date(`${today.getFullYear()}-${datas[key].endDate}`);
|
|
769
|
+
if (start > end)
|
|
770
|
+
end = new Date(`${today.getFullYear() + 1}-${datas[key].endDate}`);
|
|
771
|
+
if (today >= start && today <= end)
|
|
772
|
+
return true;
|
|
773
|
+
}
|
|
774
|
+
return false;
|
|
744
775
|
}
|
|
745
776
|
}
|
|
746
|
-
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: HomeShopService }, { token: API_URL }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
747
778
|
ShippingService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.12", ngImport: i0, type: ShippingService });
|
|
748
779
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.12", ngImport: i0, type: ShippingService, decorators: [{
|
|
749
780
|
type: Injectable
|
|
750
|
-
}], ctorParameters: function () { return [{ type: i1$3.HttpClient }, { type: undefined, decorators: [{
|
|
781
|
+
}], ctorParameters: function () { return [{ type: i1$3.HttpClient }, { type: HomeShopService }, { type: undefined, decorators: [{
|
|
751
782
|
type: Inject,
|
|
752
783
|
args: [API_URL]
|
|
753
784
|
}] }]; } });
|