@infrab4a/connect-angular 3.4.0-beta.3 → 3.4.0-beta.5
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 +39 -108
- package/bundles/infrab4a-connect-angular.umd.js.map +1 -1
- package/esm2015/services/shipping.service.js +14 -13
- package/fesm2015/infrab4a-connect-angular.js +13 -9
- package/fesm2015/infrab4a-connect-angular.js.map +1 -1
- package/package.json +1 -1
- package/services/shipping.service.d.ts +1 -3
- package/package-lock.json +0 -18
|
@@ -2,31 +2,32 @@ import { __awaiter } from "tslib";
|
|
|
2
2
|
import { HttpClient } from '@angular/common/http';
|
|
3
3
|
import { Inject, Injectable } from '@angular/core';
|
|
4
4
|
import { Shops } from '@infrab4a/connect/src';
|
|
5
|
-
import { combineLatest } from 'rxjs';
|
|
6
5
|
import { map } from 'rxjs/operators';
|
|
7
6
|
import { API_URL } from '../consts';
|
|
8
|
-
import { HomeShopService } from './home-shop.service';
|
|
9
7
|
import * as i0 from "@angular/core";
|
|
10
8
|
import * as i1 from "@angular/common/http";
|
|
11
|
-
import * as i2 from "./home-shop.service";
|
|
12
9
|
export class ShippingService {
|
|
13
|
-
constructor(http,
|
|
10
|
+
constructor(http,
|
|
11
|
+
// private homeService: HomeShopService,
|
|
12
|
+
apiUrl) {
|
|
14
13
|
this.http = http;
|
|
15
|
-
this.homeService = homeService;
|
|
16
14
|
this.apiUrl = apiUrl;
|
|
17
15
|
}
|
|
18
16
|
getMensShippingMethods(zip, weightGrams, totalPrice, personId, shop, subscriptionPlan) {
|
|
19
|
-
combineLatest([
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
]).pipe(
|
|
17
|
+
// combineLatest([
|
|
18
|
+
// this.homeService.getHomeData(),
|
|
19
|
+
// this.http.get(`${this.apiUrl}open/checkshippingcompany?personId=${personId}&postalCode=${zip}&weightGrams=${weightGrams}`)
|
|
20
|
+
// ]).pipe(
|
|
21
|
+
// map((datas, shippings) => console.log('combineLatest', datas, shippings))
|
|
22
|
+
// )
|
|
23
23
|
return this.http.get(`${this.apiUrl}open/checkshippingcompany?personId=${personId}&postalCode=${zip}&weightGrams=${weightGrams}`)
|
|
24
24
|
.pipe(map((data) => data.result), map((shippingMethods) => __awaiter(this, void 0, void 0, function* () {
|
|
25
25
|
let shippingMethodsResponse = shippingMethods;
|
|
26
26
|
console.log('shippingMethods', shippingMethods);
|
|
27
27
|
if (!shippingMethods.length)
|
|
28
28
|
return [];
|
|
29
|
-
const datas =
|
|
29
|
+
// const datas = await this.homeService.getHomeData().toPromise().then((data: any) => data.sameDayNotAvaliable)
|
|
30
|
+
const datas = [];
|
|
30
31
|
if (this.isHolidays(datas)) {
|
|
31
32
|
shippingMethodsResponse = shippingMethods.filter((method) => method.ShippingCompanyName !== 'Same Day');
|
|
32
33
|
}
|
|
@@ -78,12 +79,12 @@ export class ShippingService {
|
|
|
78
79
|
return false;
|
|
79
80
|
}
|
|
80
81
|
}
|
|
81
|
-
ShippingService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.12", ngImport: i0, type: ShippingService, deps: [{ token: i1.HttpClient }, { token:
|
|
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 });
|
|
82
83
|
ShippingService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.12", ngImport: i0, type: ShippingService });
|
|
83
84
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.12", ngImport: i0, type: ShippingService, decorators: [{
|
|
84
85
|
type: Injectable
|
|
85
|
-
}], ctorParameters: function () { return [{ type: i1.HttpClient }, { type:
|
|
86
|
+
}], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: undefined, decorators: [{
|
|
86
87
|
type: Inject,
|
|
87
88
|
args: [API_URL]
|
|
88
89
|
}] }]; } });
|
|
89
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
90
|
+
//# 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 { map } from 'rxjs/operators';\r\nimport { API_URL } from '../consts';\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        const datas = []\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}"]}
|
|
@@ -706,23 +706,27 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.12", ngImpo
|
|
|
706
706
|
}] }]; } });
|
|
707
707
|
|
|
708
708
|
class ShippingService {
|
|
709
|
-
constructor(http,
|
|
709
|
+
constructor(http,
|
|
710
|
+
// private homeService: HomeShopService,
|
|
711
|
+
apiUrl) {
|
|
710
712
|
this.http = http;
|
|
711
|
-
this.homeService = homeService;
|
|
712
713
|
this.apiUrl = apiUrl;
|
|
713
714
|
}
|
|
714
715
|
getMensShippingMethods(zip, weightGrams, totalPrice, personId, shop, subscriptionPlan) {
|
|
715
|
-
combineLatest([
|
|
716
|
-
|
|
717
|
-
|
|
718
|
-
]).pipe(
|
|
716
|
+
// combineLatest([
|
|
717
|
+
// this.homeService.getHomeData(),
|
|
718
|
+
// this.http.get(`${this.apiUrl}open/checkshippingcompany?personId=${personId}&postalCode=${zip}&weightGrams=${weightGrams}`)
|
|
719
|
+
// ]).pipe(
|
|
720
|
+
// map((datas, shippings) => console.log('combineLatest', datas, shippings))
|
|
721
|
+
// )
|
|
719
722
|
return this.http.get(`${this.apiUrl}open/checkshippingcompany?personId=${personId}&postalCode=${zip}&weightGrams=${weightGrams}`)
|
|
720
723
|
.pipe(map((data) => data.result), map((shippingMethods) => __awaiter(this, void 0, void 0, function* () {
|
|
721
724
|
let shippingMethodsResponse = shippingMethods;
|
|
722
725
|
console.log('shippingMethods', shippingMethods);
|
|
723
726
|
if (!shippingMethods.length)
|
|
724
727
|
return [];
|
|
725
|
-
const datas =
|
|
728
|
+
// const datas = await this.homeService.getHomeData().toPromise().then((data: any) => data.sameDayNotAvaliable)
|
|
729
|
+
const datas = [];
|
|
726
730
|
if (this.isHolidays(datas)) {
|
|
727
731
|
shippingMethodsResponse = shippingMethods.filter((method) => method.ShippingCompanyName !== 'Same Day');
|
|
728
732
|
}
|
|
@@ -774,11 +778,11 @@ class ShippingService {
|
|
|
774
778
|
return false;
|
|
775
779
|
}
|
|
776
780
|
}
|
|
777
|
-
ShippingService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.12", ngImport: i0, type: ShippingService, deps: [{ token: i1$3.HttpClient }, { token:
|
|
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 });
|
|
778
782
|
ShippingService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.12", ngImport: i0, type: ShippingService });
|
|
779
783
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.12", ngImport: i0, type: ShippingService, decorators: [{
|
|
780
784
|
type: Injectable
|
|
781
|
-
}], ctorParameters: function () { return [{ type: i1$3.HttpClient }, { type:
|
|
785
|
+
}], ctorParameters: function () { return [{ type: i1$3.HttpClient }, { type: undefined, decorators: [{
|
|
782
786
|
type: Inject,
|
|
783
787
|
args: [API_URL]
|
|
784
788
|
}] }]; } });
|