From 07dfd0af31db658ef864177f3b50455011e01976 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ale=C5=A1=20Roub=C3=AD=C4=8Dek?= Date: Wed, 15 Nov 2023 10:11:57 +0100 Subject: [PATCH] Extension version 2.1.7 --- CHANGELOG.md | 4 +++ apple/App.xcodeproj/project.pbxproj | 40 +++++++++++------------ extension/manifest.json | 2 +- extension/package.json | 2 +- extension/popup/about.html | 2 +- extension/shops/knihydobrovsky.mjs | 4 +-- extension/shops/tetadrogerie.mjs | 2 +- package.json | 2 +- www.hlidacshopu.cz/src/static/webapp.json | 2 +- 9 files changed, 32 insertions(+), 28 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 270dc84df..f02bc0230 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Extension +## 2.1.7 +* Fix Teta original price parsing +* Fix Knihy Dobrovsky original price parsing + ## 2.1.6 * Fix teta drogerie original price parsing * Fix Knihy Dobrovsky original price parsing diff --git a/apple/App.xcodeproj/project.pbxproj b/apple/App.xcodeproj/project.pbxproj index 7001d266c..b75f972d1 100644 --- a/apple/App.xcodeproj/project.pbxproj +++ b/apple/App.xcodeproj/project.pbxproj @@ -615,7 +615,7 @@ buildSettings = { CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 19; + CURRENT_PROJECT_VERSION = 20; DEVELOPMENT_TEAM = 8P5697C5H7; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = "iOS (ShareExtension)/Info.plist"; @@ -627,7 +627,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 2.1.6; + MARKETING_VERSION = 2.1.7; PRODUCT_BUNDLE_IDENTIFIER = "com.topmonks.hlidac-shopu.ShareExtension"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -644,7 +644,7 @@ buildSettings = { CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 19; + CURRENT_PROJECT_VERSION = 20; DEVELOPMENT_TEAM = 8P5697C5H7; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = "iOS (ShareExtension)/Info.plist"; @@ -656,7 +656,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 2.1.6; + MARKETING_VERSION = 2.1.7; PRODUCT_BUNDLE_IDENTIFIER = "com.topmonks.hlidac-shopu.ShareExtension"; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -783,7 +783,7 @@ buildSettings = { CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 19; + CURRENT_PROJECT_VERSION = 20; DEVELOPMENT_TEAM = 8P5697C5H7; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = "iOS (Extension)/Info.plist"; @@ -795,7 +795,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 2.1.6; + MARKETING_VERSION = 2.1.7; OTHER_LDFLAGS = ( "-framework", SafariServices, @@ -816,7 +816,7 @@ buildSettings = { CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 19; + CURRENT_PROJECT_VERSION = 20; DEVELOPMENT_TEAM = 8P5697C5H7; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = "iOS (Extension)/Info.plist"; @@ -828,7 +828,7 @@ "@executable_path/Frameworks", "@executable_path/../../Frameworks", ); - MARKETING_VERSION = 2.1.6; + MARKETING_VERSION = 2.1.7; OTHER_LDFLAGS = ( "-framework", SafariServices, @@ -853,7 +853,7 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 19; + CURRENT_PROJECT_VERSION = 20; DEVELOPMENT_TEAM = 8P5697C5H7; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = "iOS (App)/Info.plist"; @@ -868,7 +868,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 2.1.6; + MARKETING_VERSION = 2.1.7; OTHER_LDFLAGS = ( "-framework", SafariServices, @@ -893,7 +893,7 @@ ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 19; + CURRENT_PROJECT_VERSION = 20; DEVELOPMENT_TEAM = 8P5697C5H7; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = "iOS (App)/Info.plist"; @@ -908,7 +908,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 2.1.6; + MARKETING_VERSION = 2.1.7; OTHER_LDFLAGS = ( "-framework", SafariServices, @@ -932,7 +932,7 @@ CODE_SIGN_ENTITLEMENTS = "macOS (Extension)/hlidac shopu.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 19; + CURRENT_PROJECT_VERSION = 20; DEVELOPMENT_TEAM = 8P5697C5H7; ENABLE_HARDENED_RUNTIME = YES; GENERATE_INFOPLIST_FILE = YES; @@ -945,7 +945,7 @@ "@executable_path/../../../../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.14; - MARKETING_VERSION = 2.1.6; + MARKETING_VERSION = 2.1.7; OTHER_LDFLAGS = ( "-framework", SafariServices, @@ -966,7 +966,7 @@ CODE_SIGN_ENTITLEMENTS = "macOS (Extension)/hlidac shopu.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 19; + CURRENT_PROJECT_VERSION = 20; DEVELOPMENT_TEAM = 8P5697C5H7; ENABLE_HARDENED_RUNTIME = YES; GENERATE_INFOPLIST_FILE = YES; @@ -979,7 +979,7 @@ "@executable_path/../../../../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.14; - MARKETING_VERSION = 2.1.6; + MARKETING_VERSION = 2.1.7; OTHER_LDFLAGS = ( "-framework", SafariServices, @@ -1003,7 +1003,7 @@ CODE_SIGN_ENTITLEMENTS = "macOS (App)/hlidac shopu.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 19; + CURRENT_PROJECT_VERSION = 20; DEVELOPMENT_TEAM = 8P5697C5H7; ENABLE_HARDENED_RUNTIME = YES; GENERATE_INFOPLIST_FILE = YES; @@ -1017,7 +1017,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.14; - MARKETING_VERSION = 2.1.6; + MARKETING_VERSION = 2.1.7; OTHER_LDFLAGS = ( "-framework", SafariServices, @@ -1043,7 +1043,7 @@ CODE_SIGN_ENTITLEMENTS = "macOS (App)/hlidac shopu.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 19; + CURRENT_PROJECT_VERSION = 20; DEVELOPMENT_TEAM = 8P5697C5H7; ENABLE_HARDENED_RUNTIME = YES; GENERATE_INFOPLIST_FILE = YES; @@ -1057,7 +1057,7 @@ "@executable_path/../Frameworks", ); MACOSX_DEPLOYMENT_TARGET = 10.14; - MARKETING_VERSION = 2.1.6; + MARKETING_VERSION = 2.1.7; OTHER_LDFLAGS = ( "-framework", SafariServices, diff --git a/extension/manifest.json b/extension/manifest.json index 2a652817c..672aa0e74 100644 --- a/extension/manifest.json +++ b/extension/manifest.json @@ -3,7 +3,7 @@ "default_locale": "cs", "name": "__MSG_extensionName__", "description": "__MSG_extensionDescription__", - "version": "2.1.6", + "version": "2.1.7", "author": "TopMonks s.r.o. & contributors", "homepage_url": "https://www.hlidacshopu.cz/", "background": { diff --git a/extension/package.json b/extension/package.json index ac31d065b..d0468120e 100644 --- a/extension/package.json +++ b/extension/package.json @@ -1,6 +1,6 @@ { "name": "@hlidac-shopu/extension", - "version": "2.1.6", + "version": "2.1.7", "description": "Extension", "dependencies": { "@hlidac-shopu/lib": "workspace:*", diff --git a/extension/popup/about.html b/extension/popup/about.html index 27bdc3687..e8107b8c0 100644 --- a/extension/popup/about.html +++ b/extension/popup/about.html @@ -93,7 +93,7 @@

/> - 2.1.6 + 2.1.7

diff --git a/extension/shops/knihydobrovsky.mjs b/extension/shops/knihydobrovsky.mjs index ac028fe43..58af2e7a6 100644 --- a/extension/shops/knihydobrovsky.mjs +++ b/extension/shops/knihydobrovsky.mjs @@ -1,4 +1,4 @@ -import { cleanPrice, registerShop } from "../helpers.mjs"; +import { cleanPriceText, registerShop } from "../helpers.mjs"; import { Shop } from "./shop.mjs"; export class Knihydobrovsky extends Shop { @@ -14,7 +14,7 @@ export class Knihydobrovsky extends Shop { const elem = document.querySelector(".box-product"); if (!elem) return; - const priceBefore = cleanPrice( + const priceBefore = cleanPriceText( elem .querySelector(".box-std .price-before") .textContent.split(":") diff --git a/extension/shops/tetadrogerie.mjs b/extension/shops/tetadrogerie.mjs index cf50fc94e..9dda9cf35 100644 --- a/extension/shops/tetadrogerie.mjs +++ b/extension/shops/tetadrogerie.mjs @@ -19,7 +19,7 @@ export class TetaDrogerie extends Shop { const product = elem.querySelector(".j-product"); const itemId = product.dataset.skuid; const title = product.querySelector(".sx-detail-product-name").innerText; - const offerPrice = cleanPrice(".sx-detail-offer-valid-to"); + const offerPrice = cleanPrice(".sx-detail-offer-valid-to .sx-sale-w-arrow-container"); const actionPrice = cleanPrice(".sx-detail-price-action"); const initialPrice = cleanPrice(".sx-detail-price-initial"); const originalPrice = offerPrice ?? (actionPrice ? initialPrice / 100 : null); diff --git a/package.json b/package.json index fce0346de..c3547e377 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "hlidac-shopu", - "version": "2.1.6", + "version": "2.1.7", "private": true, "description": "Rozšíření zobrazuje historická data pro největší české eshopy.", "author": "TopMonks s.r.o. & contributors", diff --git a/www.hlidacshopu.cz/src/static/webapp.json b/www.hlidacshopu.cz/src/static/webapp.json index ec84419b7..66672afb8 100644 --- a/www.hlidacshopu.cz/src/static/webapp.json +++ b/www.hlidacshopu.cz/src/static/webapp.json @@ -1,5 +1,5 @@ { - "version": "2.1.6", + "version": "2.1.7", "name": "Hlídač Shopů", "description": "Ověřte si, jestli v nejoblíbenějších českých e-shopech nakupujete opravdu se slevou.", "type": "web",