@esolve/ng-esolve-connect 0.20.6 → 0.20.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/esm2020/lib/locations/esolve-location.model.mjs +2 -2
- package/fesm2015/esolve-ng-esolve-connect.mjs +1 -1
- package/fesm2015/esolve-ng-esolve-connect.mjs.map +1 -1
- package/fesm2020/esolve-ng-esolve-connect.mjs +1 -1
- package/fesm2020/esolve-ng-esolve-connect.mjs.map +1 -1
- package/package.json +1 -1
|
@@ -39,7 +39,7 @@ export class EsolveLocation {
|
|
|
39
39
|
const sunday = new EsolveLocationTradingDay(record.sunday_open_time, record.sunday_close_time);
|
|
40
40
|
const public_holiday = new EsolveLocationTradingDay(record.public_holiday_open_time, record.public_holiday_close_time);
|
|
41
41
|
this.trading_times = new EsolveLocationTradingTimes(monday, tuesday, wednesday, thursday, friday, saturday, sunday, public_holiday, record.trading_hours_additional_info);
|
|
42
|
-
this.geo = new EsolveLocationGEO(record.
|
|
42
|
+
this.geo = new EsolveLocationGEO(record.distance, record.range, record.target_description);
|
|
43
43
|
}
|
|
44
44
|
}
|
|
45
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"esolve-location.model.js","sourceRoot":"","sources":["../../../../../projects/ng-esolve-connect/src/lib/locations/esolve-location.model.ts"],"names":[],"mappings":"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","sourcesContent":["import { EsolveLocationRecord } from './esolve-location-record.interface';\r\nimport { EsolveLocationAddress } from './esolve-location-address.model';\r\nimport { EsolveLocationContactInfo } from './esolve-location-contact-info.model';\r\nimport { EsolveLocationPOBoxAddress } from './esolve-location-pobox-address.model';\r\nimport { EsolveLocationTradingTimes } from './esolve-location-trading-times.model';\r\nimport { EsolveLocationTradingDay } from './esolve-location-trading-day.model';\r\nimport { EsolveLocationGEO } from './esolve-location-geo.model';\r\n\r\nexport class EsolveLocation {\r\n    public id: number;\r\n    public identifier: string;\r\n    public description: string;\r\n    public head_office: boolean;\r\n    public default_location_for_payment_methods: boolean;\r\n    public external_system_code: string;\r\n    public erp_identifier: string;\r\n    public userid: number;\r\n    public importance: number;\r\n    public active: boolean;\r\n    public website_url: string;\r\n\r\n    public address: EsolveLocationAddress;\r\n    public pobox_address: EsolveLocationPOBoxAddress;\r\n    public contact_info: EsolveLocationContactInfo;\r\n    public trading_times: EsolveLocationTradingTimes;\r\n    public geo?: EsolveLocationGEO;\r\n\r\n    constructor(record: EsolveLocationRecord) {\r\n        this.id = +record.id;\r\n        this.identifier = record.identifier;\r\n        this.description = record.description;\r\n        this.head_office = !!+record.head_office;\r\n        this.erp_identifier = record.erp_identifier;\r\n        this.external_system_code = record.external_system_code;\r\n        this.default_location_for_payment_methods = !!+record.default_location_for_payment_methods;\r\n        this.userid = +record.userid;\r\n        this.importance = +record.importance;\r\n        this.active = !!+record.is_active;\r\n        this.website_url = record.website_url;\r\n\r\n        this.address = new EsolveLocationAddress(\r\n            record.street,\r\n            record.suburb,\r\n            record.city,\r\n            record.province,\r\n            record.country,\r\n            record.postal_code,\r\n            +record.latitude,\r\n            +record.longitude,\r\n        );\r\n\r\n        this.pobox_address = new EsolveLocationPOBoxAddress(\r\n            record.pobox,\r\n            record.pobox_city,\r\n            record.pobox_postal_code,\r\n        );\r\n\r\n        const telnumbers = [];\r\n\r\n        if (record.branch_telnumber.length > 0) {\r\n            telnumbers.push(record.branch_telnumber);\r\n        }\r\n\r\n        if (record.branch_telnumber_2.length > 0) {\r\n            telnumbers.push(record.branch_telnumber_2);\r\n        }\r\n\r\n        if (record.branch_telnumber_3.length > 0) {\r\n            telnumbers.push(record.branch_telnumber_3);\r\n        }\r\n\r\n        this.contact_info = new EsolveLocationContactInfo(\r\n            telnumbers,\r\n            record.branch_cellnumber,\r\n            record.branch_email,\r\n            record.branch_fax,\r\n        );\r\n\r\n        const monday = new EsolveLocationTradingDay(\r\n            record.monday_open_time,\r\n            record.monday_close_time,\r\n        );\r\n\r\n        const tuesday = new EsolveLocationTradingDay(\r\n            record.tuesday_open_time,\r\n            record.tuesday_close_time,\r\n        );\r\n\r\n        const wednesday = new EsolveLocationTradingDay(\r\n            record.wednesday_open_time,\r\n            record.wednesday_close_time,\r\n        );\r\n\r\n        const thursday = new EsolveLocationTradingDay(\r\n            record.thursday_open_time,\r\n            record.thursday_close_time,\r\n        );\r\n\r\n        const friday = new EsolveLocationTradingDay(\r\n            record.friday_open_time,\r\n            record.friday_close_time,\r\n        );\r\n\r\n        const saturday = new EsolveLocationTradingDay(\r\n            record.saturday_open_time,\r\n            record.saturday_close_time,\r\n        );\r\n\r\n        const sunday = new EsolveLocationTradingDay(\r\n            record.sunday_open_time,\r\n            record.sunday_close_time,\r\n        );\r\n\r\n        const public_holiday = new EsolveLocationTradingDay(\r\n            record.public_holiday_open_time,\r\n            record.public_holiday_close_time,\r\n        );\r\n\r\n        this.trading_times = new EsolveLocationTradingTimes(\r\n            monday,\r\n            tuesday,\r\n            wednesday,\r\n            thursday,\r\n            friday,\r\n            saturday,\r\n            sunday,\r\n            public_holiday,\r\n            record.trading_hours_additional_info,\r\n        );\r\n\r\n        this.geo = new EsolveLocationGEO(\r\n            record.range,\r\n            record.distance,\r\n            record.target_description,\r\n        );\r\n    }\r\n}\r\n\r\n\r\n"]}
|
|
45
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"esolve-location.model.js","sourceRoot":"","sources":["../../../../../projects/ng-esolve-connect/src/lib/locations/esolve-location.model.ts"],"names":[],"mappings":"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","sourcesContent":["import { EsolveLocationRecord } from './esolve-location-record.interface';\r\nimport { EsolveLocationAddress } from './esolve-location-address.model';\r\nimport { EsolveLocationContactInfo } from './esolve-location-contact-info.model';\r\nimport { EsolveLocationPOBoxAddress } from './esolve-location-pobox-address.model';\r\nimport { EsolveLocationTradingTimes } from './esolve-location-trading-times.model';\r\nimport { EsolveLocationTradingDay } from './esolve-location-trading-day.model';\r\nimport { EsolveLocationGEO } from './esolve-location-geo.model';\r\n\r\nexport class EsolveLocation {\r\n    public id: number;\r\n    public identifier: string;\r\n    public description: string;\r\n    public head_office: boolean;\r\n    public default_location_for_payment_methods: boolean;\r\n    public external_system_code: string;\r\n    public erp_identifier: string;\r\n    public userid: number;\r\n    public importance: number;\r\n    public active: boolean;\r\n    public website_url: string;\r\n\r\n    public address: EsolveLocationAddress;\r\n    public pobox_address: EsolveLocationPOBoxAddress;\r\n    public contact_info: EsolveLocationContactInfo;\r\n    public trading_times: EsolveLocationTradingTimes;\r\n    public geo?: EsolveLocationGEO;\r\n\r\n    constructor(record: EsolveLocationRecord) {\r\n        this.id = +record.id;\r\n        this.identifier = record.identifier;\r\n        this.description = record.description;\r\n        this.head_office = !!+record.head_office;\r\n        this.erp_identifier = record.erp_identifier;\r\n        this.external_system_code = record.external_system_code;\r\n        this.default_location_for_payment_methods = !!+record.default_location_for_payment_methods;\r\n        this.userid = +record.userid;\r\n        this.importance = +record.importance;\r\n        this.active = !!+record.is_active;\r\n        this.website_url = record.website_url;\r\n\r\n        this.address = new EsolveLocationAddress(\r\n            record.street,\r\n            record.suburb,\r\n            record.city,\r\n            record.province,\r\n            record.country,\r\n            record.postal_code,\r\n            +record.latitude,\r\n            +record.longitude,\r\n        );\r\n\r\n        this.pobox_address = new EsolveLocationPOBoxAddress(\r\n            record.pobox,\r\n            record.pobox_city,\r\n            record.pobox_postal_code,\r\n        );\r\n\r\n        const telnumbers = [];\r\n\r\n        if (record.branch_telnumber.length > 0) {\r\n            telnumbers.push(record.branch_telnumber);\r\n        }\r\n\r\n        if (record.branch_telnumber_2.length > 0) {\r\n            telnumbers.push(record.branch_telnumber_2);\r\n        }\r\n\r\n        if (record.branch_telnumber_3.length > 0) {\r\n            telnumbers.push(record.branch_telnumber_3);\r\n        }\r\n\r\n        this.contact_info = new EsolveLocationContactInfo(\r\n            telnumbers,\r\n            record.branch_cellnumber,\r\n            record.branch_email,\r\n            record.branch_fax,\r\n        );\r\n\r\n        const monday = new EsolveLocationTradingDay(\r\n            record.monday_open_time,\r\n            record.monday_close_time,\r\n        );\r\n\r\n        const tuesday = new EsolveLocationTradingDay(\r\n            record.tuesday_open_time,\r\n            record.tuesday_close_time,\r\n        );\r\n\r\n        const wednesday = new EsolveLocationTradingDay(\r\n            record.wednesday_open_time,\r\n            record.wednesday_close_time,\r\n        );\r\n\r\n        const thursday = new EsolveLocationTradingDay(\r\n            record.thursday_open_time,\r\n            record.thursday_close_time,\r\n        );\r\n\r\n        const friday = new EsolveLocationTradingDay(\r\n            record.friday_open_time,\r\n            record.friday_close_time,\r\n        );\r\n\r\n        const saturday = new EsolveLocationTradingDay(\r\n            record.saturday_open_time,\r\n            record.saturday_close_time,\r\n        );\r\n\r\n        const sunday = new EsolveLocationTradingDay(\r\n            record.sunday_open_time,\r\n            record.sunday_close_time,\r\n        );\r\n\r\n        const public_holiday = new EsolveLocationTradingDay(\r\n            record.public_holiday_open_time,\r\n            record.public_holiday_close_time,\r\n        );\r\n\r\n        this.trading_times = new EsolveLocationTradingTimes(\r\n            monday,\r\n            tuesday,\r\n            wednesday,\r\n            thursday,\r\n            friday,\r\n            saturday,\r\n            sunday,\r\n            public_holiday,\r\n            record.trading_hours_additional_info,\r\n        );\r\n\r\n        this.geo = new EsolveLocationGEO(\r\n            record.distance,\r\n            record.range,\r\n            record.target_description,\r\n        );\r\n    }\r\n}\r\n\r\n\r\n"]}
|
|
@@ -1867,7 +1867,7 @@ class EsolveLocation {
|
|
|
1867
1867
|
const sunday = new EsolveLocationTradingDay(record.sunday_open_time, record.sunday_close_time);
|
|
1868
1868
|
const public_holiday = new EsolveLocationTradingDay(record.public_holiday_open_time, record.public_holiday_close_time);
|
|
1869
1869
|
this.trading_times = new EsolveLocationTradingTimes(monday, tuesday, wednesday, thursday, friday, saturday, sunday, public_holiday, record.trading_hours_additional_info);
|
|
1870
|
-
this.geo = new EsolveLocationGEO(record.
|
|
1870
|
+
this.geo = new EsolveLocationGEO(record.distance, record.range, record.target_description);
|
|
1871
1871
|
}
|
|
1872
1872
|
}
|
|
1873
1873
|
|