@infrab4a/connect-angular 3.4.0-beta.7 → 3.4.0-beta.9
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 +21 -10
- package/bundles/infrab4a-connect-angular.umd.js.map +1 -1
- package/consts/backend-url.const.d.ts +1 -0
- package/consts/index.d.ts +1 -1
- package/esm2015/angular-connect.module.js +3 -3
- package/esm2015/consts/backend-url.const.js +2 -0
- package/esm2015/consts/index.js +2 -2
- package/esm2015/services/shipping.service.js +21 -10
- package/fesm2015/infrab4a-connect-angular.js +21 -10
- package/fesm2015/infrab4a-connect-angular.js.map +1 -1
- package/package.json +1 -1
- package/consts/api-url.const.d.ts +0 -1
- package/esm2015/consts/api-url.const.js +0 -2
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare const BACKEND_URL = "BACKEND_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 { BACKEND_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.backendUrl) ? [] : [{ provide: BACKEND_URL, useValue: options.backendUrl }]),
|
|
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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYW5ndWxhci1jb25uZWN0Lm1vZHVsZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3Byb2plY3RzL2Nvbm5lY3QtYW5ndWxhci9zcmMvYW5ndWxhci1jb25uZWN0Lm1vZHVsZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQXVCLFFBQVEsRUFBRSxNQUFNLGVBQWUsQ0FBQTtBQUM3RCxPQUFPLEVBQ0wsaUJBQWlCLEVBQ0EsaUJBQWlCLEVBQ2xDLGdCQUFnQixFQUNqQixNQUFNLGVBQWUsQ0FBQTtBQUN0QixPQUFPLEVBQTRCLEtBQUssRUFBUyxNQUFNLG1CQUFtQixDQUFBO0FBRTFFLE9BQU8sRUFBRSxzQkFBc0IsRUFBRSxNQUFNLDRCQUE0QixDQUFBO0FBQ25FLE9BQU8sRUFBRSwwQkFBMEIsRUFBd0IsTUFBTSxpQ0FBaUMsQ0FBQTtBQUNsRyxPQUFPLEVBQUUsV0FBVyxFQUFFLFlBQVksRUFBRSxTQUFTLEVBQUUsY0FBYyxFQUFFLE1BQU0sVUFBVSxDQUFBO0FBQy9FLE9BQU8sRUFDTCxXQUFXLEVBQ1gsV0FBVyxFQUNYLGVBQWUsRUFDZiwyQkFBMkIsRUFDM0IsYUFBYSxFQUNiLGVBQWUsRUFDZixZQUFZLEVBQ1osZUFBZSxFQUNoQixNQUFNLFlBQVksQ0FBQTs7QUFlbkIsTUFBTSxPQUFPLG9CQUFvQjtJQUMvQixNQUFNLENBQUMsYUFBYSxDQUNsQixXQUFrQixFQUNsQixPQUFpSSxFQUNqSSxZQUF5QztRQUV6QyxPQUFPO1lBQ0wsUUFBUSxFQUFFLG9CQUFvQjtZQUM5QixTQUFTLEVBQUU7Z0JBQ1QsR0FBRyxDQUFDLEtBQUssQ0FBQyxXQUFXLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUUsT0FBTyxFQUFFLFlBQVksRUFBRSxRQUFRLEVBQUUsV0FBVyxFQUFFLENBQUMsQ0FBQztnQkFDakYsR0FBRyxDQUFDLEtBQUssQ0FBQyxPQUFPLGFBQVAsT0FBTyx1QkFBUCxPQUFPLENBQUUsUUFBUSxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxRQUFRLEVBQUUsT0FBTyxhQUFQLE9BQU8sdUJBQVAsT0FBTyxDQUFFLFFBQVEsRUFBRSxDQUFDLENBQUM7Z0JBQ2pHLEdBQUcsQ0FBQyxLQUFLLENBQUMsT0FBTyxhQUFQLE9BQU8sdUJBQVAsT0FBTyxDQUFFLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRSxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsUUFBUSxFQUFFLFlBQVksRUFBRSxDQUFDLENBQUM7Z0JBQzdGLEdBQUcsQ0FBQyxLQUFLLENBQUMsT0FBTyxhQUFQLE9BQU8sdUJBQVAsT0FBTyxDQUFFLGFBQWEsQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRSxPQUFPLEVBQUUsU0FBUyxFQUFFLFFBQVEsRUFBRSxPQUFPLENBQUMsYUFBYSxFQUFFLENBQUMsQ0FBQztnQkFDbkcsR0FBRyxDQUFDLEtBQUssQ0FBQyxPQUFPLGFBQVAsT0FBTyx1QkFBUCxPQUFPLENBQUUsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLE9BQU8sRUFBRSxjQUFjLEVBQUUsUUFBUSxFQUFFLE9BQU8sQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQUFDO2dCQUMxRixHQUFHLENBQUMsS0FBSyxDQUFDLE9BQU8sYUFBUCxPQUFPLHVCQUFQLE9BQU8sQ0FBRSxVQUFVLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUUsT0FBTyxFQUFFLFdBQVcsRUFBRSxRQUFRLEVBQUUsT0FBTyxDQUFDLFVBQVUsRUFBRSxDQUFDLENBQUM7YUFDaEc7U0FDRixDQUFBO0lBQ0gsQ0FBQzs7a0hBakJVLG9CQUFvQjttSEFBcEIsb0JBQW9CLFlBWnJCLGlCQUFpQixFQUFFLHNCQUFzQixFQUFFLDBCQUEwQjttSEFZcEUsb0JBQW9CLGFBWHBCO1FBQ1QsV0FBVztRQUNYLFdBQVc7UUFDWCxlQUFlO1FBQ2YsMkJBQTJCO1FBQzNCLGFBQWE7UUFDYixlQUFlO1FBQ2YsWUFBWTtRQUNaLGVBQWU7S0FDaEIsWUFWUSxDQUFDLGlCQUFpQixFQUFFLHNCQUFzQixFQUFFLDBCQUEwQixDQUFDOzRGQVlyRSxvQkFBb0I7a0JBYmhDLFFBQVE7bUJBQUM7b0JBQ1IsT0FBTyxFQUFFLENBQUMsaUJBQWlCLEVBQUUsc0JBQXNCLEVBQUUsMEJBQTBCLENBQUM7b0JBQ2hGLFNBQVMsRUFBRTt3QkFDVCxXQUFXO3dCQUNYLFdBQVc7d0JBQ1gsZUFBZTt3QkFDZiwyQkFBMkI7d0JBQzNCLGFBQWE7d0JBQ2IsZUFBZTt3QkFDZixZQUFZO3dCQUNaLGVBQWU7cUJBQ2hCO2lCQUNGIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgTW9kdWxlV2l0aFByb3ZpZGVycywgTmdNb2R1bGUgfSBmcm9tICdAYW5ndWxhci9jb3JlJ1xyXG5pbXBvcnQge1xyXG4gIEFuZ3VsYXJGaXJlTW9kdWxlLCBGaXJlYmFzZUFwcENvbmZpZyxcclxuICBGaXJlYmFzZU9wdGlvbnMsIEZJUkVCQVNFX0FQUF9OQU1FLFxyXG4gIEZJUkVCQVNFX09QVElPTlNcclxufSBmcm9tICdAYW5ndWxhci9maXJlJ1xyXG5pbXBvcnQgeyBBeGlvc0VsYXN0aWNTZWFyY2hDb25maWcsIGlzTmlsLCBTaG9wcyB9IGZyb20gJ0BpbmZyYWI0YS9jb25uZWN0J1xyXG5cclxuaW1wb3J0IHsgQW5ndWxhckZpcmVzdG9yZU1vZHVsZSB9IGZyb20gJy4vYW5ndWxhci1maXJlc3RvcmUubW9kdWxlJ1xyXG5pbXBvcnQgeyBBbmd1bGFySGFzdXJhR3JhcGhRTE1vZHVsZSwgSGFzdXJhR3JhcGhRTE9wdGlvbnMgfSBmcm9tICcuL2FuZ3VsYXItaGFzdXJhLWdyYXBocWwubW9kdWxlJ1xyXG5pbXBvcnQgeyBCQUNLRU5EX1VSTCwgREVGQVVMVF9TSE9QLCBFU19DT05GSUcsIEhBU1VSQV9PUFRJT05TIH0gZnJvbSAnLi9jb25zdHMnXHJcbmltcG9ydCB7XHJcbiAgQXV0aFNlcnZpY2UsXHJcbiAgQ2FydFNlcnZpY2UsXHJcbiAgQ2hlY2tvdXRTZXJ2aWNlLFxyXG4gIENoZWNrb3V0U3Vic2NyaXB0aW9uU2VydmljZSxcclxuICBDb3Vwb25TZXJ2aWNlLFxyXG4gIEhvbWVTaG9wU2VydmljZSxcclxuICBPcmRlclNlcnZpY2UsXHJcbiAgU2hpcHBpbmdTZXJ2aWNlXHJcbn0gZnJvbSAnLi9zZXJ2aWNlcydcclxuXHJcbkBOZ01vZHVsZSh7XHJcbiAgaW1wb3J0czogW0FuZ3VsYXJGaXJlTW9kdWxlLCBBbmd1bGFyRmlyZXN0b3JlTW9kdWxlLCBBbmd1bGFySGFzdXJhR3JhcGhRTE1vZHVsZV0sXHJcbiAgcHJvdmlkZXJzOiBbXHJcbiAgICBBdXRoU2VydmljZSxcclxuICAgIENhcnRTZXJ2aWNlLFxyXG4gICAgQ2hlY2tvdXRTZXJ2aWNlLFxyXG4gICAgQ2hlY2tvdXRTdWJzY3JpcHRpb25TZXJ2aWNlLFxyXG4gICAgQ291cG9uU2VydmljZSxcclxuICAgIEhvbWVTaG9wU2VydmljZSxcclxuICAgIE9yZGVyU2VydmljZSxcclxuICAgIFNoaXBwaW5nU2VydmljZVxyXG4gIF0sXHJcbn0pXHJcbmV4cG9ydCBjbGFzcyBBbmd1bGFyQ29ubmVjdE1vZHVsZSB7XHJcbiAgc3RhdGljIGluaXRpYWxpemVBcHAoXHJcbiAgICBkZWZhdWx0U2hvcDogU2hvcHMsXHJcbiAgICBvcHRpb25zOiB7IGZpcmViYXNlOiBGaXJlYmFzZU9wdGlvbnM7IGVsYXN0aWNTZWFyY2g6IEF4aW9zRWxhc3RpY1NlYXJjaENvbmZpZzsgaGFzdXJhOiBIYXN1cmFHcmFwaFFMT3B0aW9ucywgYmFja2VuZFVybDogc3RyaW5nIH0sXHJcbiAgICBuYW1lT3JDb25maWc/OiBzdHJpbmcgfCBGaXJlYmFzZUFwcENvbmZpZyxcclxuICApOiBNb2R1bGVXaXRoUHJvdmlkZXJzPEFuZ3VsYXJGaXJlTW9kdWxlPiB7XHJcbiAgICByZXR1cm4ge1xyXG4gICAgICBuZ01vZHVsZTogQW5ndWxhckNvbm5lY3RNb2R1bGUsXHJcbiAgICAgIHByb3ZpZGVyczogW1xyXG4gICAgICAgIC4uLihpc05pbChkZWZhdWx0U2hvcCkgPyBbXSA6IFt7IHByb3ZpZGU6IERFRkFVTFRfU0hPUCwgdXNlVmFsdWU6IGRlZmF1bHRTaG9wIH1dKSxcclxuICAgICAgICAuLi4oaXNOaWwob3B0aW9ucz8uZmlyZWJhc2UpID8gW10gOiBbeyBwcm92aWRlOiBGSVJFQkFTRV9PUFRJT05TLCB1c2VWYWx1ZTogb3B0aW9ucz8uZmlyZWJhc2UgfV0pLFxyXG4gICAgICAgIC4uLihpc05pbChvcHRpb25zPy5maXJlYmFzZSkgPyBbXSA6IFt7IHByb3ZpZGU6IEZJUkVCQVNFX0FQUF9OQU1FLCB1c2VWYWx1ZTogbmFtZU9yQ29uZmlnIH1dKSxcclxuICAgICAgICAuLi4oaXNOaWwob3B0aW9ucz8uZWxhc3RpY1NlYXJjaCkgPyBbXSA6IFt7IHByb3ZpZGU6IEVTX0NPTkZJRywgdXNlVmFsdWU6IG9wdGlvbnMuZWxhc3RpY1NlYXJjaCB9XSksXHJcbiAgICAgICAgLi4uKGlzTmlsKG9wdGlvbnM/Lmhhc3VyYSkgPyBbXSA6IFt7IHByb3ZpZGU6IEhBU1VSQV9PUFRJT05TLCB1c2VWYWx1ZTogb3B0aW9ucy5oYXN1cmEgfV0pLFxyXG4gICAgICAgIC4uLihpc05pbChvcHRpb25zPy5iYWNrZW5kVXJsKSA/IFtdIDogW3sgcHJvdmlkZTogQkFDS0VORF9VUkwsIHVzZVZhbHVlOiBvcHRpb25zLmJhY2tlbmRVcmwgfV0pLFxyXG4gICAgICBdLFxyXG4gICAgfVxyXG4gIH1cclxufVxyXG4iXX0=
|
|
@@ -0,0 +1,2 @@
|
|
|
1
|
+
export const BACKEND_URL = 'BACKEND_URL';
|
|
2
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmFja2VuZC11cmwuY29uc3QuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9wcm9qZWN0cy9jb25uZWN0LWFuZ3VsYXIvc3JjL2NvbnN0cy9iYWNrZW5kLXVybC5jb25zdC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxNQUFNLENBQUMsTUFBTSxXQUFXLEdBQUcsYUFBYSxDQUFBIiwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0IGNvbnN0IEJBQ0tFTkRfVVJMID0gJ0JBQ0tFTkRfVVJMJyJdfQ==
|
package/esm2015/consts/index.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
export * from './
|
|
1
|
+
export * from './backend-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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9wcm9qZWN0cy9jb25uZWN0LWFuZ3VsYXIvc3JjL2NvbnN0cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxjQUFjLHFCQUFxQixDQUFBO0FBQ25DLGNBQWMsc0JBQXNCLENBQUE7QUFDcEMsY0FBYyxtQkFBbUIsQ0FBQTtBQUNqQyxjQUFjLHdCQUF3QixDQUFBIiwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0ICogZnJvbSAnLi9iYWNrZW5kLXVybC5jb25zdCdcclxuZXhwb3J0ICogZnJvbSAnLi9kZWZhdWx0LXNob3AuY29uc3QnXHJcbmV4cG9ydCAqIGZyb20gJy4vZXMtY29uZmlnLmNvbnN0J1xyXG5leHBvcnQgKiBmcm9tICcuL2hhc3VyYS1vcHRpb25zLmNvbnN0J1xyXG5cclxuIl19
|
|
@@ -3,7 +3,7 @@ import { Inject, Injectable } from '@angular/core';
|
|
|
3
3
|
import { Shops } from '@infrab4a/connect';
|
|
4
4
|
import { combineLatest } from 'rxjs';
|
|
5
5
|
import { map } from 'rxjs/operators';
|
|
6
|
-
import {
|
|
6
|
+
import { BACKEND_URL } from '../consts';
|
|
7
7
|
import { HomeShopService } from './home-shop.service';
|
|
8
8
|
import * as i0 from "@angular/core";
|
|
9
9
|
import * as i1 from "@angular/common/http";
|
|
@@ -23,24 +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
33
|
if (this.isHolidays(datasSameDayNotAvaliable)) {
|
|
28
34
|
shippingMethods = shippingMethods.filter((method) => method.ShippingCompanyName !== 'Same Day');
|
|
29
35
|
}
|
|
30
|
-
if (totalPrice >= 200
|
|
31
|
-
|
|
36
|
+
if (totalPrice >= 200) {
|
|
37
|
+
shippingMethods = shippingMethods.map(s => {
|
|
32
38
|
if (s.serviceName !== 'Same Day')
|
|
33
39
|
return Object.assign(Object.assign({}, s), { totalPrice: 0 });
|
|
34
40
|
else
|
|
35
41
|
return s;
|
|
36
42
|
});
|
|
37
43
|
}
|
|
38
|
-
if (this.
|
|
39
|
-
|
|
40
|
-
if (s.serviceName
|
|
44
|
+
if (this.isFreeShippingBySubscription(shop, subscriptionPlan)) {
|
|
45
|
+
shippingMethods = shippingMethods.map(s => {
|
|
46
|
+
if (s.serviceName == 'Same Day')
|
|
41
47
|
return Object.assign(Object.assign({}, s), { totalPrice: s.totalPrice / 2 });
|
|
42
48
|
else
|
|
43
|
-
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 });
|
|
44
55
|
});
|
|
45
56
|
}
|
|
46
57
|
return shippingMethods;
|
|
@@ -78,12 +89,12 @@ export class ShippingService {
|
|
|
78
89
|
return false;
|
|
79
90
|
}
|
|
80
91
|
}
|
|
81
|
-
ShippingService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.12", ngImport: i0, type: ShippingService, deps: [{ token: i1.HttpClient }, { token:
|
|
92
|
+
ShippingService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.12", ngImport: i0, type: ShippingService, deps: [{ token: i1.HttpClient }, { token: BACKEND_URL }, { token: i2.HomeShopService }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
82
93
|
ShippingService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.12", ngImport: i0, type: ShippingService });
|
|
83
94
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.12", ngImport: i0, type: ShippingService, decorators: [{
|
|
84
95
|
type: Injectable
|
|
85
96
|
}], ctorParameters: function () { return [{ type: i1.HttpClient }, { type: undefined, decorators: [{
|
|
86
97
|
type: Inject,
|
|
87
|
-
args: [
|
|
98
|
+
args: [BACKEND_URL]
|
|
88
99
|
}] }, { type: i2.HomeShopService }]; } });
|
|
89
|
-
//# 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 { BACKEND_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(BACKEND_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}"]}
|
|
@@ -50,7 +50,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.12", ngImpo
|
|
|
50
50
|
args: ['UserRepository']
|
|
51
51
|
}] }]; } });
|
|
52
52
|
|
|
53
|
-
const
|
|
53
|
+
const BACKEND_URL = 'BACKEND_URL';
|
|
54
54
|
|
|
55
55
|
const DEFAULT_SHOP = 'DEFAULT_SHOP';
|
|
56
56
|
|
|
@@ -719,24 +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
729
|
if (this.isHolidays(datasSameDayNotAvaliable)) {
|
|
724
730
|
shippingMethods = shippingMethods.filter((method) => method.ShippingCompanyName !== 'Same Day');
|
|
725
731
|
}
|
|
726
|
-
if (totalPrice >= 200
|
|
727
|
-
|
|
732
|
+
if (totalPrice >= 200) {
|
|
733
|
+
shippingMethods = shippingMethods.map(s => {
|
|
728
734
|
if (s.serviceName !== 'Same Day')
|
|
729
735
|
return Object.assign(Object.assign({}, s), { totalPrice: 0 });
|
|
730
736
|
else
|
|
731
737
|
return s;
|
|
732
738
|
});
|
|
733
739
|
}
|
|
734
|
-
if (this.
|
|
735
|
-
|
|
736
|
-
if (s.serviceName
|
|
740
|
+
if (this.isFreeShippingBySubscription(shop, subscriptionPlan)) {
|
|
741
|
+
shippingMethods = shippingMethods.map(s => {
|
|
742
|
+
if (s.serviceName == 'Same Day')
|
|
737
743
|
return Object.assign(Object.assign({}, s), { totalPrice: s.totalPrice / 2 });
|
|
738
744
|
else
|
|
739
|
-
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 });
|
|
740
751
|
});
|
|
741
752
|
}
|
|
742
753
|
return shippingMethods;
|
|
@@ -774,13 +785,13 @@ class ShippingService {
|
|
|
774
785
|
return false;
|
|
775
786
|
}
|
|
776
787
|
}
|
|
777
|
-
ShippingService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.12", ngImport: i0, type: ShippingService, deps: [{ token: i1$3.HttpClient }, { token:
|
|
788
|
+
ShippingService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.12", ngImport: i0, type: ShippingService, deps: [{ token: i1$3.HttpClient }, { token: BACKEND_URL }, { token: HomeShopService }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
778
789
|
ShippingService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.12", ngImport: i0, type: ShippingService });
|
|
779
790
|
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.12", ngImport: i0, type: ShippingService, decorators: [{
|
|
780
791
|
type: Injectable
|
|
781
792
|
}], ctorParameters: function () { return [{ type: i1$3.HttpClient }, { type: undefined, decorators: [{
|
|
782
793
|
type: Inject,
|
|
783
|
-
args: [
|
|
794
|
+
args: [BACKEND_URL]
|
|
784
795
|
}] }, { type: HomeShopService }]; } });
|
|
785
796
|
|
|
786
797
|
class AngularFirebaseAuthModule {
|
|
@@ -1366,7 +1377,7 @@ class AngularConnectModule {
|
|
|
1366
1377
|
...(isNil(options === null || options === void 0 ? void 0 : options.firebase) ? [] : [{ provide: FIREBASE_APP_NAME, useValue: nameOrConfig }]),
|
|
1367
1378
|
...(isNil(options === null || options === void 0 ? void 0 : options.elasticSearch) ? [] : [{ provide: ES_CONFIG, useValue: options.elasticSearch }]),
|
|
1368
1379
|
...(isNil(options === null || options === void 0 ? void 0 : options.hasura) ? [] : [{ provide: HASURA_OPTIONS, useValue: options.hasura }]),
|
|
1369
|
-
...(isNil(options === null || options === void 0 ? void 0 : options.
|
|
1380
|
+
...(isNil(options === null || options === void 0 ? void 0 : options.backendUrl) ? [] : [{ provide: BACKEND_URL, useValue: options.backendUrl }]),
|
|
1370
1381
|
],
|
|
1371
1382
|
};
|
|
1372
1383
|
}
|