@infrab4a/connect-angular 3.4.0-beta.6 → 3.4.0-beta.8
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 +18 -10
- package/bundles/infrab4a-connect-angular.umd.js.map +1 -1
- package/esm2015/services/shipping.service.js +19 -11
- package/esm2015/services/types/shipping-methods.type.js +1 -1
- package/fesm2015/infrab4a-connect-angular.js +18 -10
- package/fesm2015/infrab4a-connect-angular.js.map +1 -1
- package/package.json +1 -1
- package/services/shipping.service.d.ts +1 -1
- package/services/types/shipping-methods.type.d.ts +1 -1
|
@@ -14,7 +14,7 @@ export class ShippingService {
|
|
|
14
14
|
this.apiUrl = apiUrl;
|
|
15
15
|
this.homeService = homeService;
|
|
16
16
|
}
|
|
17
|
-
|
|
17
|
+
getShippingMethods(shop, zip, weightGrams, totalPrice, personId, subscriptionPlan) {
|
|
18
18
|
return combineLatest([
|
|
19
19
|
this.homeService.getHomeData(),
|
|
20
20
|
this.http.get(`${this.apiUrl}open/checkshippingcompany?personId=${personId}&postalCode=${zip}&weightGrams=${weightGrams}`)
|
|
@@ -23,27 +23,35 @@ export class ShippingService {
|
|
|
23
23
|
let shippingMethods = shippingMethodsResponse.result;
|
|
24
24
|
if (!shippingMethods.length)
|
|
25
25
|
return [];
|
|
26
|
+
shippingMethods = shippingMethods.map(s => {
|
|
27
|
+
if (s.ShippingCompanyName == 'Same Day EG')
|
|
28
|
+
s.ShippingCompanyName = 'Same Day';
|
|
29
|
+
else
|
|
30
|
+
return s;
|
|
31
|
+
});
|
|
26
32
|
const datasSameDayNotAvaliable = datas.sameDayNotAvaliable;
|
|
27
|
-
console.log('params que checgou', shop, zip, weightGrams, totalPrice, personId, subscriptionPlan);
|
|
28
|
-
console.log('shippingMethods', shippingMethods);
|
|
29
|
-
console.log('datas isHolidays', this.isHolidays(datasSameDayNotAvaliable));
|
|
30
33
|
if (this.isHolidays(datasSameDayNotAvaliable)) {
|
|
31
34
|
shippingMethods = shippingMethods.filter((method) => method.ShippingCompanyName !== 'Same Day');
|
|
32
35
|
}
|
|
33
|
-
if (totalPrice >= 200
|
|
34
|
-
|
|
36
|
+
if (totalPrice >= 200) {
|
|
37
|
+
shippingMethods = shippingMethods.map(s => {
|
|
35
38
|
if (s.serviceName !== 'Same Day')
|
|
36
39
|
return Object.assign(Object.assign({}, s), { totalPrice: 0 });
|
|
37
40
|
else
|
|
38
41
|
return s;
|
|
39
42
|
});
|
|
40
43
|
}
|
|
41
|
-
if (this.
|
|
42
|
-
|
|
43
|
-
if (s.serviceName
|
|
44
|
+
if (this.isFreeShippingBySubscription(shop, subscriptionPlan)) {
|
|
45
|
+
shippingMethods = shippingMethods.map(s => {
|
|
46
|
+
if (s.serviceName == 'Same Day')
|
|
44
47
|
return Object.assign(Object.assign({}, s), { totalPrice: s.totalPrice / 2 });
|
|
45
48
|
else
|
|
46
|
-
return s;
|
|
49
|
+
return Object.assign(Object.assign({}, s), { totalPrice: 0 });
|
|
50
|
+
});
|
|
51
|
+
}
|
|
52
|
+
if (this.isHalfShippingBySubscription(shop, subscriptionPlan)) {
|
|
53
|
+
shippingMethods = shippingMethods.map(s => {
|
|
54
|
+
return Object.assign(Object.assign({}, s), { totalPrice: s.totalPrice / 2 });
|
|
47
55
|
});
|
|
48
56
|
}
|
|
49
57
|
return shippingMethods;
|
|
@@ -89,4 +97,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.12", ngImpo
|
|
|
89
97
|
type: Inject,
|
|
90
98
|
args: [API_URL]
|
|
91
99
|
}] }, { type: i2.HomeShopService }]; } });
|
|
92
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
100
|
+
//# 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        shippingMethods = shippingMethods.map(s => {\r\n          if (s.ShippingCompanyName == 'Same Day EG') s.ShippingCompanyName = 'Same Day'\r\n          else return s\r\n        })\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) {\r\n          shippingMethods = 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.isFreeShippingBySubscription(shop, subscriptionPlan)) {\r\n          shippingMethods = shippingMethods.map(s => {\r\n            if (s.serviceName == 'Same Day') return { ...s, totalPrice: s.totalPrice/2 }\r\n            else return { ...s, totalPrice: 0 }\r\n          })\r\n        }\r\n\r\n        if (this.isHalfShippingBySubscription(shop, subscriptionPlan)) {\r\n          shippingMethods = shippingMethods.map(s => {\r\n            return { ...s, totalPrice: s.totalPrice/2 }\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=
|
|
@@ -710,7 +710,7 @@ class ShippingService {
|
|
|
710
710
|
this.apiUrl = apiUrl;
|
|
711
711
|
this.homeService = homeService;
|
|
712
712
|
}
|
|
713
|
-
|
|
713
|
+
getShippingMethods(shop, zip, weightGrams, totalPrice, personId, subscriptionPlan) {
|
|
714
714
|
return combineLatest([
|
|
715
715
|
this.homeService.getHomeData(),
|
|
716
716
|
this.http.get(`${this.apiUrl}open/checkshippingcompany?personId=${personId}&postalCode=${zip}&weightGrams=${weightGrams}`)
|
|
@@ -719,27 +719,35 @@ class ShippingService {
|
|
|
719
719
|
let shippingMethods = shippingMethodsResponse.result;
|
|
720
720
|
if (!shippingMethods.length)
|
|
721
721
|
return [];
|
|
722
|
+
shippingMethods = shippingMethods.map(s => {
|
|
723
|
+
if (s.ShippingCompanyName == 'Same Day EG')
|
|
724
|
+
s.ShippingCompanyName = 'Same Day';
|
|
725
|
+
else
|
|
726
|
+
return s;
|
|
727
|
+
});
|
|
722
728
|
const datasSameDayNotAvaliable = datas.sameDayNotAvaliable;
|
|
723
|
-
console.log('params que checgou', shop, zip, weightGrams, totalPrice, personId, subscriptionPlan);
|
|
724
|
-
console.log('shippingMethods', shippingMethods);
|
|
725
|
-
console.log('datas isHolidays', this.isHolidays(datasSameDayNotAvaliable));
|
|
726
729
|
if (this.isHolidays(datasSameDayNotAvaliable)) {
|
|
727
730
|
shippingMethods = shippingMethods.filter((method) => method.ShippingCompanyName !== 'Same Day');
|
|
728
731
|
}
|
|
729
|
-
if (totalPrice >= 200
|
|
730
|
-
|
|
732
|
+
if (totalPrice >= 200) {
|
|
733
|
+
shippingMethods = shippingMethods.map(s => {
|
|
731
734
|
if (s.serviceName !== 'Same Day')
|
|
732
735
|
return Object.assign(Object.assign({}, s), { totalPrice: 0 });
|
|
733
736
|
else
|
|
734
737
|
return s;
|
|
735
738
|
});
|
|
736
739
|
}
|
|
737
|
-
if (this.
|
|
738
|
-
|
|
739
|
-
if (s.serviceName
|
|
740
|
+
if (this.isFreeShippingBySubscription(shop, subscriptionPlan)) {
|
|
741
|
+
shippingMethods = shippingMethods.map(s => {
|
|
742
|
+
if (s.serviceName == 'Same Day')
|
|
740
743
|
return Object.assign(Object.assign({}, s), { totalPrice: s.totalPrice / 2 });
|
|
741
744
|
else
|
|
742
|
-
return s;
|
|
745
|
+
return Object.assign(Object.assign({}, s), { totalPrice: 0 });
|
|
746
|
+
});
|
|
747
|
+
}
|
|
748
|
+
if (this.isHalfShippingBySubscription(shop, subscriptionPlan)) {
|
|
749
|
+
shippingMethods = shippingMethods.map(s => {
|
|
750
|
+
return Object.assign(Object.assign({}, s), { totalPrice: s.totalPrice / 2 });
|
|
743
751
|
});
|
|
744
752
|
}
|
|
745
753
|
return shippingMethods;
|