diff --git a/controllers/enquiries_controller.php b/controllers/enquiries_controller.php index 48c72d31..f0ba0001 100755 --- a/controllers/enquiries_controller.php +++ b/controllers/enquiries_controller.php @@ -105,22 +105,22 @@ class EnquiriesController extends AppController { * eg. CMC1245NE351234-456 */ $enquiryid = $this->Enquiry->findCount(); /* Find what number we are - CMCXXXX */ - $enquiryoffset = 7203; //What Number Enquiry we were at before using this package. + $enquiryoffset = 7882; //What Number Enquiry we were at before using this package. $enquiryid += $enquiryoffset; $enquiryid++; /* Find how many enquiries have been for this principle code */ $principleenquiries = $this->Enquiry->findCount('principle_code ='. $principle['Principle']['code']); /* Principle Code Offsets - Existing Number of Enquiries for each Principle Code */ - $principlecode_offset = array( 15 => 204, //ELMAC, AMAL - 20 => 49, //T and B Electronic - 25 => 2021, //ATEX,Brilex,Marston - 35 => 2030, //Mid-West Instrument, DP - 36 => 46, //Reading Technologies - 37 => 2020, //Eldridge, Smart Measurement, Alia - 65 => 2189, //Papenmeier, Herberts Industrieglas - 85 => 585, //Analytical Systems, Misc - 95 => 171); //Comet, T and D. + $principlecode_offset = array( 15 => 207, //ELMAC, AMAL + 20 => 51, //T and B Electronic + 25 => 2062, //ATEX,Brilex,Marston + 35 => 2068, //Mid-West Instrument, DP + 36 => 47, //Reading Technologies + 37 => 2040, //Eldridge, Smart Measurement, Alia + 65 => 2212, //Papenmeier, Herberts Industrieglas + 85 => 586, //Analytical Systems, Misc + 95 => 181); //Comet, T and D. $principleenquiries += $principlecode_offset[$principle['Principle']['code']]; //Add the offset. $principleenquiries++; @@ -140,41 +140,41 @@ class EnquiriesController extends AppController { /*Add the offsets for the State Principle Enquiries for each Code */ $stateprinciple_offset = array( //Elmac, Amal - 15 => array("NSW" => 39, "VIC" => 36, "TAS" => 58, + 15 => array("NSW" => 39, "VIC" => 38, "TAS" => 58, "ACT" => 0, "QLD" => 30, "NT" => 0, - "WA" => 18, "SA" => 0, "Overseas" => 0), + "WA" => 19, "SA" => 8, "Overseas" => 1), //T and B Electronic - 20 => array("NSW" => 13, "VIC" => 6, "TAS" => 0, + 20 => array("NSW" => 14, "VIC" => 6, "TAS" => 0, "ACT" => 0, "QLD" => 8, "NT" => 0, - "WA" => 12, "SA" => 0, "Overseas" => 4), + "WA" => 12, "SA" => 1, "Overseas" => 5), //ATEX,Brilex,Marston - 25 => array("NSW" => 569, "VIC" => 589, "TAS" => 186, - "ACT" => 0, "QLD" => 250, "NT" => 3, - "WA" => 540, "SA" => 71, "Overseas" => 612), + 25 => array("NSW" => 580, "VIC" => 599, "TAS" => 186, + "ACT" => 0, "QLD" => 254, "NT" => 3, + "WA" => 541, "SA" => 72, "Overseas" => 625), //Mid-West Instrument, DP - 35 => array("NSW" => 530, "VIC" => 844, "TAS" => 9, - "ACT" => 0, "QLD" => 250, "NT" => 14, - "WA" => 464, "SA" => 507, "Overseas" => 149), - //Reading Technologies ****TO DO**** - 36 => array("NSW" => 0, "VIC" => 0, "TAS" => 0, - "ACT" => 0, "QLD" => 0, "NT" => 0, - "WA" => 0, "SA" => 0, "Overseas" => 0), - //Eldridge, Smart Measurement, Alia *** TO DO*** - 37 => array("NSW" => 0, "VIC" => 0, "TAS" => 0, - "ACT" => 0, "QLD" => 0, "NT" => 0, - "WA" => 0, "SA" => 0, "Overseas" => 0), - //Papenmeier, Herberts Industrieglas *** TO DO*** - 65 => array("NSW" => 0, "VIC" => 0, "TAS" => 0, - "ACT" => 0, "QLD" => 0, "NT" => 0, - "WA" => 0, "SA" => 0, "Overseas" => 0), - //Analytical Systems, Misc *** TO DO*** - 85 => array("NSW" => 0, "VIC" => 0, "TAS" => 0, - "ACT" => 0, "QLD" => 0, "NT" => 0, - "WA" => 0, "SA" => 0, "Overseas" => 0), - //Comet, T and D. *** TO DO*** - 95 => array("NSW" => 0, "VIC" => 0, "TAS" => 0, - "ACT" => 0, "QLD" => 0, "NT" => 0, - "WA" => 0, "SA" => 0, "Overseas" => 0), + 35 => array("NSW" => 549, "VIC" => 851, "TAS" => 9, + "ACT" => 0, "QLD" => 245, "NT" => 15, + "WA" => 470, "SA" => 508, "Overseas" => 154), + //Reading Technologies + 36 => array("NSW" => 1, "VIC" => 3, "TAS" => 0, + "ACT" => 0, "QLD" => 7, "NT" => 0, + "WA" => 0, "SA" => 4, "Overseas" => 2), + //Eldridge, Smart Measurement, Alia + 37 => array("NSW" => 204, "VIC" => 60, "TAS" => 1, + "ACT" => 0, "QLD" => 130, "NT" => 1, + "WA" => 44, "SA" => 25, "Overseas" => 18), + //Papenmeier, Herberts Industrieglas + 65 => array("NSW" => 498, "VIC" => 537, "TAS" => 44, + "ACT" => 0, "QLD" => 158, "NT" => 12, + "WA" => 138, "SA" => 25, "Overseas" => 174), + //Analytical Systems, Misc + 85 => array("NSW" => 3, "VIC" => 6, "TAS" => 0, + "ACT" => 0, "QLD" => 1, "NT" => 0, + "WA" => 2, "SA" => 2, "Overseas" => 0), + //Comet, T and D. + 95 => array("NSW" => 34, "VIC" => 28, "TAS" => 6, + "ACT" => 0, "QLD" => 29, "NT" => 0, + "WA" => 9, "SA" => 8, "Overseas" => 31), ); $stateprincipleenquiries += $stateprinciple_offset[$principle['Principle']['code']][$state['State']['shortform']]; $stateprincipleenquiries++;