diff --git a/AddrMap.php b/AddrMap.php index 4779277..c75efdd 100644 --- a/AddrMap.php +++ b/AddrMap.php @@ -61,6 +61,13 @@ class AddrMap{ return $this->dist/1000; } + public function get_route_json() + { + if ($this->error) + return null; + return $this->json; + } + private function update_db() { global $wpdb; @@ -118,6 +125,7 @@ class AddrMap{ $row = $wpdb->get_row($query); if ( $row == null ) return false; + $this->json = json_decode($row->response); return (int) $row->distance; //in meters; } diff --git a/ts.php b/ts.php index 018138a..b37adbc 100644 --- a/ts.php +++ b/ts.php @@ -67,6 +67,7 @@ class AcareOffice{ $this->db = $wpdb; $this->table_name = $wpdb->prefix . 'acare_ts'; $this->addr_table = $wpdb->prefix . 'acare_addr_distance'; + $this->ndis_table = $wpdb->prefix . 'acare_ndis_price'; } @@ -88,7 +89,9 @@ class AcareOffice{ $this->xero = new Xero(); $this->xero->init_wp(); - $abc = new AddrMap("01515b52-6936-46b2-a000-9ad4cd7a5b50", "0768db6d-e5f4-4b45-89a2-29f7e8d2953c"); + //$abc = new AddrMap("01515b52-6936-46b2-a000-9ad4cd7a5b50", "0768db6d-e5f4-4b45-89a2-29f7e8d2953c"); + $abc = new AddrMap("122eb1d0-d8c4-4fc3-8bf8-b7825bee1a01", "0768db6d-e5f4-4b45-89a2-29f7e8d2953c"); + } //init database @@ -122,10 +125,22 @@ class AcareOffice{ PRIMARY KEY (id) ) $charset_collate;"; + $ndis_table = $this->ndis_table; + $sql_ndis_price = " + CREATE TABLE $ndis_table ( + code VARCHAR(45) NOT NULL, + name VARCHAR(45) NULL, + level INT NULL, + unit VARCHAR(45) NULL, + price FLOAT NULL, + year INT NOT NULL, + PRIMARY KEY (code, year) + )$charset_collate;"; //create database require_once( ABSPATH . 'wp-admin/includes/upgrade.php' ); dbDelta( $sql ); dbDelta( $sql_addr); + dbDelta( $sql_ndis_price); } //