Bugfix in order delivered trigger & removed tokens

.homeychangelog.json

@@ -49,5 +49,8 @@
  },
  "3.0.1": {
  "en": "Bugfix order announced end time"
+ },
+ "3.0.2": {
+ "en": "Bugfix in order delivered trigger, removed trigger tokens"
  }
 }

.homeycompose/flow/triggers/groceries_delivered.json

@@ -3,25 +3,5 @@
  "title": {
  "en": "Groceries have been delivered",
  "nl": "Boodschappen zijn bezorgd"
- },
- "tokens": [
- {
- "name": "delivery_time",
- "type": "string",
- "title": {
- "en": "delivery time",
- "nl": "aflevertijd"
- },
- "example": "20:45"
- },
- {
- "name": "delivery_date",
- "type": "string",
- "title": {
- "en": "eta_date",
- "nl": "afleverdatum"
- },
- "example": "2018-09-03"
- }
- ] 
+ }
 }

APPSTORE.md

@@ -38,9 +38,9 @@ Polling the status of your Picnic account every 5 minutes and providing trigger
 
 ## CHANGELOG
 
-### 3.0.1
+### 3.0.2
 
-- Bugfix order announced end time
+- Bugfix in order delivered trigger, removed trigger tokens
 
 ## Donate
 Feel free to donate if you like the app :-)

README.md

@@ -40,6 +40,10 @@ Polling the status of your Picnic account every 5 minutes and providing trigger
 
 ## CHANGELOG
 
+### 3.0.2
+
+- Bugfix in order delivered trigger, removed trigger tokens
+
 ### 3.0.1
 
 - Bugfix order announced end time

app.js

@@ -41,6 +41,7 @@ class Picnic extends Homey.App {
  //this.homey.settings.unset("x-picnic-auth")
  //this.homey.settings.unset("username")
  //this.homey.settings.unset("password")
+ //this.homey.settings.set("order_status", "order_announced")
 
  // retrieve initial order info
  if (this.homey.settings.getKeys().indexOf("x-picnic-auth") != -1)
@@ -161,16 +162,12 @@ class Picnic extends Homey.App {
  }
  else if (orderEvent["event"] == 'groceries_delivered') {
  this.debug("Order changed to groceries_delivered, firing trigger")
- var delivery_time = orderEvent["delivery_time"].replace(/T/, ' ').replace(/\..+/, '').split(' ')[1].slice(0, -3)
- var delivery_date = orderEvent["delivery_time"].replace(/T/, ' ').replace(/\..+/, '').split(' ')[0]
 
- let delivery = { 'delivery_date': delivery_date, 'delivery_time': delivery_time }
-
-
- this._groceriesDelivered.trigger(delivery)
+ this._groceriesDelivered.trigger()
  this.homey.app.changeInterval(DEFAULT_POLL_INTERVAL);
 
  this.homey.settings.unset("delivery_eta_start")
+ this.homey.settings.unset("delivery_eta_end")
  }
  }
  })
@@ -324,7 +321,7 @@ class Picnic extends Homey.App {
  this.debug("Retrieved status from picnic server: order_delivered")
  this.homey.settings.set("order_status", "order_delivered")
 
- return resolve({ "event": "groceries_delivered", "delivery_time": JSON.parse(content)[0]["delivery_time"]["end"] })
+ return resolve({ "event": "groceries_delivered" })
  }
  else if (JSON.parse(content)[0]["delivery_time"] == undefined && JSON.parse(content)[0]["eta2"] != undefined && this.homey.settings.get("order_status") != "order_announced")
  {
@@ -347,9 +344,10 @@ class Picnic extends Homey.App {
  this.debug("Order status didnt change, currently: "+this.homey.settings.get("order_status"))
  }
  }
- else if (JSON.parse(content).length == 0){
- this.debug("No order found, considering this as delivered, but not throwing the delivered trigger.")
+ else if (JSON.parse(content).length == 0 && this.homey.settings.get("order_status") != "order_delivered" && this.homey.settings.get("order_status") != undefined){
+ this.debug("No order found, considering this as delivered.")
  this.homey.settings.set("order_status", "order_delivered")
+ return resolve({ "event": "groceries_delivered"})
  }
  })
  .catch(error => {

app.json

@@ -129,27 +129,7 @@
  "title": {
  "en": "Groceries have been delivered",
  "nl": "Boodschappen zijn bezorgd"
- },
- "tokens": [
- {
- "name": "delivery_time",
- "type": "string",
- "title": {
- "en": "delivery time",
- "nl": "aflevertijd"
- },
- "example": "20:45"
- },
- {
- "name": "delivery_date",
- "type": "string",
- "title": {
- "en": "eta_date",
- "nl": "afleverdatum"
- },
- "example": "2018-09-03"
- }
- ]
+ }
  },
  {
  "id": "groceries_ordered",

package.json

@@ -1,6 +1,6 @@
 {
  "name": "app.picnic",
- "version": "2.3.3",
+ "version": "3.0.2",
  "description": "Doing your groceries at Picnic via Homey.",
  "dependencies": {
  "md5": "^2.2.1",