diff --git a/.gitignore b/.gitignore index 44818c3a..d5c74071 100755 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,5 @@ vendors/tcpdf/cache/* tests/* emails/* nbproject/* +processed_vaultmsgs/* +vaultmsgs/* diff --git a/controllers/line_items_controller.php b/controllers/line_items_controller.php index 3a4e5116..4fcf3bf0 100755 --- a/controllers/line_items_controller.php +++ b/controllers/line_items_controller.php @@ -19,41 +19,21 @@ class LineItemsController extends AppController { $this->set('lineItem', $this->LineItem->read(null, $id)); } - function add($quoteid = null) { - - if (!$quoteid && empty($this->data)) { - $this->Session->setFlash(__('Invalid Quote ID', true)); + function add($documentID = null) { + $this->layout = 'ajax'; + if (!$documentID && empty($this->data)) { + $this->Session->setFlash(__('Invalid Document ID', true)); $this->redirect(array('action'=>'index')); } if (!empty($this->data)) { $this->LineItem->create(); - if(isset($this->data['LineItem']['product_id'])) { - $product = $this->LineItem->Product->findById($this->data['LineItem']['product_id']); - - /* Copy all the data from the Product to the new LineItem */ - - $this->data['LineItem']['description'] = $product['Product']['description']; - $this->data['LineItem']['title'] = $product['Product']['title']; - } - - - - // $numberOfItems = $this->LineItem->find('count', - // array('conditions' => array('LineItem.quote_id' => $this->data['LineItem']['quote_id']))); - - //$numberOfItems++; - - // $this->data['LineItem']['item_number'] = $numberOfItems; - - - if ($this->LineItem->save($this->data)) { - $quoteid = $this->data['LineItem']['quote_id']; + $documentID = $this->data['LineItem']['document_id']; $this->Session->setFlash(__('Product Added to Quote Successfully', true)); - $this->redirect(array('controller'=>'quotes', 'action'=>'view', $quoteid)); + $this->redirect(array('controller'=>'documents', 'action'=>'view', $documentID)); } else { $this->Session->setFlash(__('The LineItem could not be saved. Please, try again.', true)); } @@ -61,9 +41,9 @@ class LineItemsController extends AppController { $principles = $this->LineItem->Product->Principle->find('list'); - - $quote = $this->LineItem->Quote->read(null, $quoteid); - $this->set(compact('principles','quote', 'products')); + $products = $this->LineItem->Product->find('list'); + + $this->set(compact('principles', 'products')); } diff --git a/controllers/shipments_controller.php b/controllers/shipments_controller.php index 359cc02c..b989fd7a 100644 --- a/controllers/shipments_controller.php +++ b/controllers/shipments_controller.php @@ -101,7 +101,7 @@ class ShipmentsController extends AppController { $address = $this->Shipment->Address->find('first', array('conditions'=>array('Address.id'=>$this->data['Shipment']['address_id']),'recursive'=>0)); - + $principles = $this->Shipment->Principle->find('list'); $freightForwarders = $this->Shipment->FreightForwarder->find('list'); $shipmentType = $this->typeOptions(false); @@ -149,14 +149,16 @@ class ShipmentsController extends AppController { } print_r($boxIDs);*/ - $jobIDs = array(); - foreach($this->data['Job'] as $job) { - foreach($job as $index => $id) { - $jobIDs[] = $id; + if($this->data['Shipment']['type'] > 1) { + $jobIDs = array(); + foreach($this->data['Job'] as $job) { + foreach($job as $index => $id) { + $jobIDs[] = $id; + } } - } - $this->Shipment->Job->updateAll(array('Job.all_sent' => 1), array('Job.id'=>$jobIDs)); + $this->Shipment->Job->updateAll(array('Job.all_sent' => 1), array('Job.id'=>$jobIDs)); + } //print_r($this->data); diff --git a/models/doc_page.php b/models/doc_page.php new file mode 100755 index 00000000..8c267fcd --- /dev/null +++ b/models/doc_page.php @@ -0,0 +1,22 @@ + array( + 'className' => 'Document', + 'foreignKey' => 'document_id', + 'conditions' => '', + 'fields' => '', + 'order' => '' + ) + ); + + + + var $order = 'DocPage.page_number ASC'; + +} +?> \ No newline at end of file diff --git a/views/line_items/add.ctp b/views/line_items/add.ctp index fe3bda82..5dc1657a 100755 --- a/views/line_items/add.ctp +++ b/views/line_items/add.ctp @@ -5,12 +5,11 @@ input('item_number'); echo $form->input('option'); + echo $form->input('product_id'); echo $form->input('quantity'); echo $form->input('title'); echo $form->input('description'); echo $form->input('document_id'); - echo $form->input('product_id'); - echo $form->input('costing_id'); echo $form->input('unit_price'); echo $form->input('net_price_each'); echo $form->input('discount_percent'); @@ -22,12 +21,4 @@ end('Submit');?> -
- -
+ diff --git a/webroot/js/add_edit_shipment.js b/webroot/js/add_edit_shipment.js index 41eddcf2..e4e5cf02 100644 --- a/webroot/js/add_edit_shipment.js +++ b/webroot/js/add_edit_shipment.js @@ -186,10 +186,11 @@ $(function() { var shipmentTypeID = getSelectedID('#shipmentType'); shipmentTypeID = parseInt(shipmentTypeID); $(".hiddenDefault").hide(); - + $(".moreInfo").show(); switch(shipmentTypeID) { case 1: //Import - $("#importFields, #principle, #purchaseOrder").show(); + $("#importFields,#job,#principle, #purchaseOrder").show(); + $(".moreInfo").hide(); showCommonFields(); break; diff --git a/webroot/js/lineItemPriceNoCosting.js b/webroot/js/lineItemPriceNoCosting.js index 7fa0d46f..8809a26d 100755 --- a/webroot/js/lineItemPriceNoCosting.js +++ b/webroot/js/lineItemPriceNoCosting.js @@ -1,10 +1,3 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ - - - $(function () { $("input.nocostinput").change(calcNetPrice); //When inputs of class nocostinput change. Calculate quick prices