From 0353cd49f174b5d200d067198ca82747bc723c9c Mon Sep 17 00:00:00 2001
From: patrick <patrick@lawipac.comm>
Date: Mon, 4 May 2020 02:24:18 +1000
Subject: [PATCH] new ndis price listed together with old price, using ID to
 differentiate each

---
 NdisPrice.php    | 14 ++++----------
 js/bts_office.js |  2 +-
 ts.php           |  3 ++-
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/NdisPrice.php b/NdisPrice.php
index 545e54b..b8c26bf 100644
--- a/NdisPrice.php
+++ b/NdisPrice.php
@@ -6,26 +6,19 @@ class NdisPrice{
     private $html = '';
     private $ndis_table; 
     private $tos =[];
-    private $current_year = 2020;
     public function __construct(int $year=2019) {
         global $wpdb;
         
-        if ( $year == "2019"){
-            $now = new \DateTime();
-            //$year = (int)($now->format("Y"));
-        }
-        
-        
         $this->ndis_table = $wpdb->prefix . 'acare_ndis_price';
-        $sql = "SELECT * FROM {$this->ndis_table} WHERE year=$year"; //for this year
+        $sql = "SELECT * FROM {$this->ndis_table}"; //for this year
         $results = $wpdb->get_results($sql);
         
         $this->tos =[];
         $html = '            	<select>';
         foreach($results as $r){
-            $this->tos[$r->code] = $r;
+            $this->tos[$r->id] = $r;
 
-            $html .= sprintf('<option value="%d" data-ndis="%s" data-level="%d" data-year="%d"  data-unit="%s" data-price="%.2f" data-ot="%s">%.2f - %s %s %s</option>',
+            $html .= sprintf('<option value="%d" data-ndis="%s" data-level="%d" data-year="%d"  data-unit="%s" data-price="%.2f" data-ot="%s">$%.2f -(date:%d)- %s %s %s</option>',
                 $r->id,
                 $r->code,
                 $r->level,
@@ -34,6 +27,7 @@ class NdisPrice{
                 (float) $r->price,
                 $r->ot,
                 (float) $r->price,
+                $r->year,
                 $r->name,
                 $this->get_level((int) $r->level),
                 $r->ot
diff --git a/js/bts_office.js b/js/bts_office.js
index 7884dc7..2fc3b32 100644
--- a/js/bts_office.js
+++ b/js/bts_office.js
@@ -1990,7 +1990,7 @@
 			});
 			if (matches.length != 1){
 				$(selector).find('.bstart').addClass("error");
-				$(selector).find(".bstart_err").html("No matching Job");
+				$(selector).find(".bstart_err").html("No matched driving Job");
 				ensure_visible(selector);
 				console.warn("1 driving job has more than 1 matching", $(selector).attr('id'), matches);
 				return false;
diff --git a/ts.php b/ts.php
index 0e0d9b6..32c9d77 100644
--- a/ts.php
+++ b/ts.php
@@ -201,7 +201,8 @@ class AcareOffice{
         $in_kind_program = $this->get_client_in_kind_program($record->client);
         $ClaimType = "";// standard;
         $CancellationReason="";
-        return "$registration,$ndisnumber,$start,$finish,$record->tos,REC_{$record->id},$quantity,$hours,$unitprice,$GST,$authorizedby,$participant_approved,$in_kind_program,$ClaimType,$CancellationReason\n";
+        $SupportNumber = $this->get_ndis_price()->get_tos_ndis_code($record->tos);
+        return "$registration,$ndisnumber,$start,$finish,$SupportNumber,REC_{$record->id},$quantity,$hours,$unitprice,$GST,$authorizedby,$participant_approved,$in_kind_program,$ClaimType,$CancellationReason\n";
     }
     
     private function get_client_ndis_account($client)