benny/iOS-Widgets
1
0
Fork 0
mirror of https://github.com/ThisIsBenny/iOS-Widgets.git synced 2025-06-07 05:57:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

bugfix

Browse source 
Signed-off-by: Benny Samir Hierl <bennysamir@posteo.de>
This commit is contained in:
Benny Samir Hierl 2020-11-17 22:15:31 +01:00
parent e315f91ef4
commit db46b2e123
No known key found for this signature in database
GPG key ID: 69DE3C3C097DB7F7
1 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
Apple-Order-Status/Apple-Store-Order-Status.js
View file

@ -1,7 +1,7 @@
// Variables used by Scriptable. // Variables used by Scriptable.
// These must be at the very top of the file. Do not edit. // These must be at the very top of the file. Do not edit.
// icon-color: deep-blue; icon-glyph: shopping-cart; // icon-color: deep-blue; icon-glyph: shopping-cart;
// Version 1.1.1 // Version 1.1.2
const cacheMinutes = 60 * 2 const cacheMinutes = 60 * 2
const today = new Date() const today = new Date()
@ -116,9 +116,9 @@ const parseShortDate = (stringDate, orderMonth) => {
let m let m
m = stringDate.match(/([\d]{1,2}) ([\w]{3})/) m = stringDate.match(/([\d]{1,2}) ([\w]{3})/)
if (!m) { if (!m) {
m = stringDate.match(/([\w]{3}) ([\d]{1,2})/) m = stringDate.match(/([\w]+),? ([\d]{1,2})/)
if (m) { if (m) {
const t = m[1] const t = m[1].slice(0, 3)
m[1] = m[2] m[1] = m[2]
m[2] = t m[2] = t
} else { } else {
@ -269,6 +269,7 @@ if (!orderDetails) {
if (widgetInput[2] && !orderDetails['orderDetail']['orderItems']['c'][widgetInput[2] - 1]) { if (widgetInput[2] && !orderDetails['orderDetail']['orderItems']['c'][widgetInput[2] - 1]) {
throw new Error(`No Item on position ${widgetInput[2]}`) throw new Error(`No Item on position ${widgetInput[2]}`)
} }
const languageCode = Device.preferredLanguages()[0].match(/^[\a-z]{2}/)
const itemPosition = orderDetails['orderDetail']['orderItems']['c'][(widgetInput[2] - 1) || 0] const itemPosition = orderDetails['orderDetail']['orderItems']['c'][(widgetInput[2] - 1) || 0]
const itemDetails = orderDetails['orderDetail']['orderItems'][itemPosition]['orderItemDetails'] const itemDetails = orderDetails['orderDetail']['orderItems'][itemPosition]['orderItemDetails']
@ -315,10 +316,7 @@ if (!orderDetails) {
itemNameText.lineLimit = 2 itemNameText.lineLimit = 2
widget.addSpacer() widget.addSpacer()
if (deliveryDate !== null && itemStatusTracker['d']['currentStatus'] !== 'DELIVERED') {
if (deliveryDate !== null) {
const languageCode = Device.preferredLanguages()[0].match(/^[\a-z]{2}/)
const t = (localeText[languageCode]) ? localeText[languageCode] : localeText.default const t = (localeText[languageCode]) ? localeText[languageCode] : localeText.default
let postFix = (remainingDays === 1) ? t[0] : t[1] let postFix = (remainingDays === 1) ? t[0] : t[1]
@ -373,11 +371,20 @@ if (!orderDetails) {
fallbackStack.layoutHorizontally() fallbackStack.layoutHorizontally()
fallbackStack.addSpacer() fallbackStack.addSpacer()
let icon = false let icon
if (itemDetails['d']['deliveryDate'] === 'Out for Delivery') { let text
if (itemStatusTracker['d']['currentStatus'] === 'DELIVERED') {
icon = SFSymbol.named('house')
const localeStatusText = (localeText[languageCode] && localeText[languageCode][2]) ? localeText[languageCode][2] : localeText.default[2]
text = localeStatusText['DELIVERED']
} else if (itemDetails['d']['deliveryDate'] === 'Out for Delivery') {
icon = SFSymbol.named('shippingbox') icon = SFSymbol.named('shippingbox')
text = itemDetails['d']['deliveryDate'] // ToDO: Add translation
} else {
text = itemDetails['d']['deliveryDate']
} }
if (icon !== false) { if (icon) {
const iconStack = fallbackStack.addStack() const iconStack = fallbackStack.addStack()
iconStack.layoutVertically() iconStack.layoutVertically()
iconStack.addSpacer() iconStack.addSpacer()
@ -394,7 +401,7 @@ if (!orderDetails) {
fallbackTextStack.centerAlignContent() fallbackTextStack.centerAlignContent()
fallbackTextStack.addSpacer() fallbackTextStack.addSpacer()
const fallbackText = fallbackTextStack.addText(itemDetails['d']['deliveryDate']) const fallbackText = fallbackTextStack.addText(text)
fallbackText.font = Font.regularSystemFont(14) fallbackText.font = Font.regularSystemFont(14)
fallbackText.textColor = Color.black() fallbackText.textColor = Color.black()
fallbackText.minimumScaleFactor = 0.5 fallbackText.minimumScaleFactor = 0.5