diff --git a/app/config/core.php b/app/config/core.php index 7887f500..6f9af7e1 100644 --- a/app/config/core.php +++ b/app/config/core.php @@ -41,7 +41,7 @@ error_reporting(E_ALL & ~E_STRICT & ~E_DEPRECATED); * In production mode, flash messages redirect after a time interval. * In development mode, you need to click the flash message to continue. */ -Configure::write('debug', 0); +Configure::write('debug', 1); Configure::write('version', '1.0.1'); diff --git a/app/config/database.php b/app/config/database.php index 56058f83..f4ae8732 100644 --- a/app/config/database.php +++ b/app/config/database.php @@ -11,7 +11,7 @@ class DATABASE_CONFIG { 'persistent' => false, 'host' => '172.17.0.1', 'login' => 'cmc', - 'password' => 'xVRQI&cA?7AU=hqJ!%au', + 'password' => 'cmc', 'database' => 'cmc', 'prefix' => '', ); diff --git a/app/vendors/pdfdoc.php b/app/vendors/pdfdoc.php index e45541bf..29151fe8 100755 --- a/app/vendors/pdfdoc.php +++ b/app/vendors/pdfdoc.php @@ -17,7 +17,7 @@ class PDFDOC extends FPDI { $this->SetTextColor(0); $this->SetFontSize(11); //Changed from 12 - $this->SetFont('times', ''); + $this->SetFont('helvetica', ''); $this->writeHTML($content, true, false, false, false, ''); } @@ -32,9 +32,9 @@ class PDFDOC extends FPDI { // $this->Image($file, $x, $y, $w, $h, $type, $link, $align, $resize, $dpi, $palign, $ismask, $imgmask, $border, $fitbox, $hidden) - $this->Image(K_PATH_IMAGES.'cmclogosmall.jpg', 10, 10, 30, 0, null, 'http://www.cmctechnologies.com.au', null, false, null, 'L'); + $this->Image(K_PATH_IMAGES.'2020cmclogosmall.jpg', 10, 10, 0, 28, null, 'http://www.cmctechnologies.com.au', null, false, null, 'L'); $this->Cell(30); - $this->SetFont('times', 'B'); + $this->SetFont('helvetica', 'B'); $this->SetFontSize(30); $this->Cell(0,0, $this->xheadertext, 0,1,'C', 1); $this->SetFontSize(10); @@ -43,20 +43,20 @@ class PDFDOC extends FPDI { $this->Cell(0,0, "PTY LIMITED ACN: 085 991 224 ABN: 47 085 991 224", 0, 1, 'C', 1); //$this->Rect($x, $y, $w, $h, $style, $border_style); - $this->Rect($this->GetX()+33, $this->GetY()+2, 157, 1, 'DF', array('width'=>0), array(0, 0, 0)); + $this->Rect($this->GetX()+33, $this->GetY()+2, 157, 0.2, 'DF', array('width'=>0), array(0, 0, 0)); /* Start the contact details */ $this->SetTextColor(0); //Set the Text Color to Black - $this->MultiCell(18, 0, "Phone:\nFax:\nEmail:\nWeb Site:\n", 0, 'L', 0, 0, 45, 32); + $this->MultiCell(30, 0, "Phone:\nFax:\nEmail:\nWeb Site:\n", 0, 'L', 0, 0, 45, 32); + $this->SetFont('helvetica', ''); + $this->MultiCell(55, 0, "+61 2 9669 4000
+61 2 9669 4111
sales@cmctechnologies.com.au +
www.cmctechnologies.net.au
", 0, 'L', 0, 0, 65, null, true, 0, true); - $this->MultiCell(50, 0, "+61 2 9669 4000
+61 2 9669 4111
sales@cmctechnologies.com.au -
www.cmctechnologies.com.au
", 0, 'L', 0, 0, 65, null, true, 0, true); - - $this->MultiCell(50, 0, "Unit 19, 77 Bourke Rd\nAlexandria\nNSW 2015\nAUSTRALIA\n", 0, 'L', 0, 0, 150, null); + $this->MultiCell(52, 0, "Unit 19, 77 Bourke Rd\nAlexandria NSW 2015\nAUSTRALIA\n", 0, 'L', 0, 0, 150, null); $this->SetTextColor(0 , 0, 152); //Set the Text Color to Blue - $this->SetFont('times', 'B'); + $this->SetFont('helvetica', 'B'); $this->MultiCell(30, 20, "Engineering &\nIndustrial\nInstrumentation", 0, 'L', 0, 1, 10,37); } @@ -73,7 +73,7 @@ class PDFDOC extends FPDI { $html = <<CMC TECHNOLOGIES Provides Solutions in the Following Fields
- +
EXPLOSION PREVENTION AND PROTECTION—PRESSURE RELIEF—VISION IN THE PROCESS
EXPLOSION PREVENTION AND PROTECTION—FIRE PROTECTION—PRESSURE RELIEF—VISION IN THE PROCESS
FLOW MEASUREMENT—PROCESS INSTRUMENTATION
ENDHTML; @@ -145,7 +145,7 @@ ENDTABLE; $this->SetFontSize(7); //Kinda lame that I cant seem to wrap this text nicer. But Whatever. - $this->MultiCell(0, 0, 'The information in this document is confidential and may be privileged. If you are not the indended recipient then access, disclosure, copying or other dissemination of the contents of t his message is unauthorised and may be unlawful. Please inform the sender immediately if you are not the intended addressee.', + $this->MultiCell(0, 0, 'The information in this document is confidential and may be privileged. If you are not the indended recipient then access, disclosure, copying or other dissemination of the contents of this message is unauthorised and may be unlawful. Please inform the sender immediately if you are not the intended addressee.', '', 'L', false, 1 ); diff --git a/app/vendors/tcpdf/images/2020cmclogosmall.jpg b/app/vendors/tcpdf/images/2020cmclogosmall.jpg new file mode 100644 index 00000000..3c198d11 Binary files /dev/null and b/app/vendors/tcpdf/images/2020cmclogosmall.jpg differ diff --git a/app/views/elements/pdf_shipping_billing_box.ctp b/app/views/elements/pdf_shipping_billing_box.ctp index c7480a0a..de61da18 100755 --- a/app/views/elements/pdf_shipping_billing_box.ctp +++ b/app/views/elements/pdf_shipping_billing_box.ctp @@ -16,14 +16,47 @@ $col3width = '30%'; Estimated Despatch Date:
- + Page: of

MAKE PAYMENT TO:
+ + + Account Name: CMC Technologies Pty Ltd
+ Account Number/IBAN: 06200015682004
+ Branch code: 06200
+ SWIFT Code/BIC: CTBAAU2S
+ + + + Account Name: CMC Technologies Pty Ltd
+ Account Number/IBAN: 06200015642694
+ Branch code: 06200
+ SWIFT Code/BIC: CTBAAU2S
+ + + + Account Name: CMC Technologies Pty Ltd
+ Account Number/IBAN: 06200015681984
+ Branch code: 06200
+ SWIFT Code/BIC: CTBAAU2S
+ + + Account Name: CMC Technologies Pty Ltd
Bank Number BSB#: 062-458
Account Number: 10067982
- SWIFT Code: CTBAAU2S + SWIFT Code: CTBAAU2S
+ IBAN: 06245810067982
 + + + Account Name: CMC Technologies Pty Ltd
+ Bank Number BSB#: 062-458
+ Account Number: 10067982
+ SWIFT Code: CTBAAU2S
+ IBAN: 06245810067982
+ + diff --git a/app/views/elements/pdf_shipping_billing_box_oa.ctp b/app/views/elements/pdf_shipping_billing_box_oa.ctp index 34201647..ff2fbddf 100755 --- a/app/views/elements/pdf_shipping_billing_box_oa.ctp +++ b/app/views/elements/pdf_shipping_billing_box_oa.ctp @@ -17,11 +17,43 @@ $col3width = '30%'; Page: of

MAKE PAYMENT TO:
+ + Account Name: CMC Technologies Pty Ltd
+ Account Number/IBAN: 06200015682004
+ Branch code: 06200
+ SWIFT Code/BIC: CTBAAU2S
+ + + + Account Name: CMC Technologies Pty Ltd
+ Account Number/IBAN: 06200015642694
+ Branch code: 06200
+ SWIFT Code/BIC: CTBAAU2S
+ + + + Account Name: CMC Technologies Pty Ltd
+ Account Number/IBAN: 06200015681984
+ Branch code: 06200
+ SWIFT Code/BIC: CTBAAU2S
+ + + Account Name: CMC Technologies Pty Ltd
Bank Number BSB#: 062-458
Account Number: 10067982
- SWIFT Code: CTBAAU2S + SWIFT Code: CTBAAU2S
+ IBAN: 06245810067982
 + + + Account Name: CMC Technologies Pty Ltd
+ Bank Number BSB#: 062-458
+ Account Number: 10067982
+ SWIFT Code: CTBAAU2S
+ IBAN: 06245810067982
+ + diff --git a/app/webroot/js/document_add_edit.js b/app/webroot/js/document_add_edit.js index a1f49067..a664c59a 100755 --- a/app/webroot/js/document_add_edit.js +++ b/app/webroot/js/document_add_edit.js @@ -485,7 +485,7 @@ $(function() { $("#saveOAButton").click(function() { saveDocument('Order Acknowledgement'); //if the job has changed, the create invoice button wont work properly. - window.location.reload(true); + //window.location.reload(true); $('.job-title').html($("#OrderAcknowledgementJobId :selected").text()); }); @@ -500,7 +500,7 @@ $(function() { $("#savePackingListButton").click(function() { saveDocument('Packing List'); //if the job has changed, the create invoice button wont work properly. - window.location.reload(true); + //window.location.reload(true); $('.job-title').html($("#PackingListJobId :selected").text()); });