diff --git a/controllers/app_controller.php b/controllers/app_controller.php index 212ab420..c066fe4c 100755 --- a/controllers/app_controller.php +++ b/controllers/app_controller.php @@ -37,6 +37,11 @@ class AppController extends Controller { function isAuthorized() { return true; } + + + + + } diff --git a/controllers/enquiries_controller.php b/controllers/enquiries_controller.php index 0beda462..fbd6cde4 100755 --- a/controllers/enquiries_controller.php +++ b/controllers/enquiries_controller.php @@ -3,7 +3,7 @@ class EnquiriesController extends AppController { var $name = 'Enquiries'; - var $helpers = array('Html', 'Form', 'Javascript', 'Time', 'Ajax', 'Number', 'Text', 'Cache'); + var $helpers = array('Html', 'Form', 'Javascript', 'Time', 'Number', 'Text', 'Cache'); var $paginate = array( @@ -28,6 +28,8 @@ class EnquiriesController extends AppController { $status_list[$statusid] = $status['Status']['name']; } $this->set('status_list', $status_list); + + //debug($this->paginate()); // $this->set('status_list', $this->Enquiry->Status->find('list')); } diff --git a/vendors/xtcpdf.php b/vendors/xtcpdf.php index f459adb1..34ee3783 100755 --- a/vendors/xtcpdf.php +++ b/vendors/xtcpdf.php @@ -308,6 +308,8 @@ class XTCPDF extends TCPDF { $thisTotalPrice = $product[$docType]['quantity']*$product[$docType]['unit_price']; $this->MultiCell($totalPricColwidth, $heightNeeded, $this->formatCurrency($currency['symbol'],$thisTotalPrice), 1, "C", 0, 1); + + $subTotal += $thisTotalPrice; $lastY = $this->GetY(); $lastX = $this->GetX(); diff --git a/views/products/add.ctp b/views/products/add.ctp index a18d122c..c5efce9b 100755 --- a/views/products/add.ctp +++ b/views/products/add.ctp @@ -1,4 +1,4 @@ -link('quotenik/product_buildup.js', false); ?> +
create('Product', array('id'=>'productaddform', 'class'=>'addproduct'));?>
@@ -12,24 +12,16 @@ echo $form->input('part_number'); echo $form->input('notes'); - - echo $html->link('Show/Hide Costing Details', '#', array('onClick' => "Effect.toggle('costingdetails', 'appear'); return false;")); + + echo $html->image('calculator.png'); - echo $ajax->div('costingdetails'); - - //echo $this->e - //lement('product_costing', array('modelName' => 'Product')); - - echo $ajax->divEnd('costingdetails'); - - + ?>
end(array('label' => 'Add Product')); - echo $javascript->codeBlock("new Validation('productaddform', {immediate : true, useTitles : true});", array('allowCache'=>true, 'safe'=>false)); - + ?> diff --git a/views/quotes/pdf.ctp b/views/quotes/pdf.ctp index d3847181..bcfb598b 100755 --- a/views/quotes/pdf.ctp +++ b/views/quotes/pdf.ctp @@ -2,9 +2,6 @@ App::import('Vendor','xtcpdf'); -//print_r($quote); - -//print_r($enquiry); $tcpdf = new XTCPDF('P', 'mm', 'A4', true, false, 'UTF-8'); @@ -93,7 +90,7 @@ $principle_name = strtoupper($enquiry['Principle']['name']); debug($commercialDetails); -$tcpdf->productPage($principle_name, $quote['Currency'], $enquiry['Enquiry']['gst'], $products, 'QuoteProduct', $commercialDetails); +$tcpdf->productPage($principle_name, $quote['Currency'], $enquiry['Enquiry']['gst'], $products, 'LineItem', $commercialDetails); diff --git a/views/quotes/view.ctp b/views/quotes/view.ctp index 26c63a99..1bd283e9 100755 --- a/views/quotes/view.ctp +++ b/views/quotes/view.ctp @@ -95,8 +95,9 @@ foreach ($quote['QuotePage'] as $quotePage): + + ?> create('Quote');?> -
- input('id', array('type' => 'hidden', 'value' => $quote['Quote']['id'])); +
+ input('id', array('type' => 'hidden', 'value' => $quote['Quote']['id'])); - echo $form->input('enquiry_id', array('type' => 'hidden')); - echo $form->input('delivery_time'); - echo $this->element('payment_terms_box'); - echo $form->input('date_issued'); - echo $form->input('days_valid', array('default'=>'30')); - echo $form->input('currency_id', array('label' => 'Sale Currency', 'options' => $currencies)); - echo $form->input('delivery_point', array('default' => 'EX-CMC TECHNOLOGIES, ALEXANDRIA NSW')); - echo $form->input('exchange_rate', array('default' => 'FIXED')); - echo $form->input('customs_duty', array('default' => 'NIL')); + echo $form->input('enquiry_id', array('type' => 'hidden')); + echo $form->input('delivery_time'); + echo $this->element('payment_terms_box'); + echo $form->input('date_issued'); + echo $form->input('days_valid', array('default'=>'30')); + echo $form->input('currency_id', array('label' => 'Sale Currency', 'options' => $currencies)); + echo $form->input('delivery_point', array('default' => 'EX-CMC TECHNOLOGIES, ALEXANDRIA NSW')); + echo $form->input('exchange_rate', array('default' => 'FIXED')); + echo $form->input('customs_duty', array('default' => 'NIL')); - echo $form->end('Update Commercial Terms'); - ?> -
+ echo $form->end('Update Commercial Terms'); + ?> +
@@ -208,3 +209,39 @@ foreach ($quote['QuotePage'] as $quotePage):
+ + +
+create('LineItem');?> +
+ + input('item_number'); + echo $form->input('option'); + echo $form->input('quantity'); + echo $form->input('title'); + echo $form->input('description'); + echo $form->input('quote_id'); + echo $form->input('product_id'); + echo $form->input('costing_id'); + echo $form->input('unit_price'); + ?> +
+end('Submit');?> +
+ + + + + + + +} \ No newline at end of file diff --git a/webroot/js/product-model-number-builder.js b/webroot/js/product-model-number-builder.js index bbad9138..8cc3594e 100644 --- a/webroot/js/product-model-number-builder.js +++ b/webroot/js/product-model-number-builder.js @@ -1,6 +1,6 @@ function doModelConfig() { $("#sortable").sortable('enable'); - alert('fuck'); + //$("#sortable").sortable('disable');