springup/cmc-sales
2
0
Fork 0
Code Issues 48 Pull requests Actions Packages Projects Releases Wiki Activity

Added payment terms box to quote details

Browse source
This commit is contained in:
Karl Cordes 2011-06-20 16:29:50 +10:00
parent e5edf973fd
commit 337b2662a6
2 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
views/quotes/edit.ctp
View file

@ -34,15 +34,14 @@ echo $form->input('revision', array('type'=>'hidden'));
echo $form->input('delivery_time'); echo $form->input('delivery_time');
echo $form->input('delivery_time_frame',array('type'=>'select', 'empty'=>'Choose Delivery Time Frame', 'options'=>array('WORKING DAYS'=>'WORKING DAYS', 'WORKING WEEKS'=>'WORKING WEEKS'))); echo $form->input('delivery_time_frame',array('type'=>'select', 'empty'=>'Choose Delivery Time Frame', 'options'=>array('WORKING DAYS'=>'WORKING DAYS', 'WORKING WEEKS'=>'WORKING WEEKS')));
echo $this->element('payment_terms_box');
echo $form->input('payment_terms');
echo $form->input('days_valid'); echo $form->input('days_valid');
echo $form->input('date_issued_display', array('id'=>'date_issued_display', 'label'=>'Date Issued', 'value'=>$this->element('isEmptyDate', array('date'=>$this->data['Quote']['date_issued'])))); echo $form->input('date_issued_display', array('id'=>'date_issued_display', 'label'=>'Date Issued', 'value'=>$this->element('isEmptyDate', array('date'=>$this->data['Quote']['date_issued']))));
echo $form->input('date_issued', array('type'=>'hidden', 'id'=>'date_issued')); echo $form->input('date_issued', array('type'=>'hidden', 'id'=>'date_issued'));
echo $form->input('valid_until_display', array('id'=>'valid_until_display', 'label'=>'Valid Until', 'value'=>$this->element('isEmptyDate', array('date'=>$this->data['Quote']['valid_until'])))); echo $form->input('valid_until_display', array('id'=>'valid_until_display', 'label'=>'Valid Until', 'value'=>$this->element('isEmptyDate', array('date'=>$this->data['Quote']['valid_until']))));
echo $form->input('valid_until', array('type'=>'hidden', 'id'=>'valid_until')); echo $form->input('valid_until', array('type'=>'hidden', 'id'=>'valid_until'));
echo $form->input('delivery_point'); echo $form->input('delivery_point');
echo $form->input('exchange_rate'); echo $form->input('exchange_rate', array('default'=>'NOT APPLICABLE, FIXED PRICE QUOTED'));
echo $form->input('customs_duty'); echo $form->input('customs_duty');
echo $form->input('document_id',array('type'=>'hidden')); echo $form->input('document_id',array('type'=>'hidden'));
echo $form->input('commercial_comments', array('between'=>'<button class="generateCommercialComments">(re)Generate Commercial Comments</button>')); echo $form->input('commercial_comments', array('between'=>'<button class="generateCommercialComments">(re)Generate Commercial Comments</button>'));

10
webroot/js/document_add_edit.js
View file

@ -303,13 +303,6 @@ $(function() {
}); });
$("#QuoteDeliveryTimeFrame").live('change', function() {
tf = $(this).val();
alert(tf);
});
}); });
@ -319,6 +312,7 @@ $('.generateCommercialComments').live('click', function(event) {
var deliveryTime = $("#QuoteDeliveryTime").val(); var deliveryTime = $("#QuoteDeliveryTime").val();
var deliveryTF = $("#QuoteDeliveryTimeFrame").val();
var paymentTerms = $("#QuotePaymentTerms").val(); var paymentTerms = $("#QuotePaymentTerms").val();
var daysValid = $("#QuoteDaysValid").val(); var daysValid = $("#QuoteDaysValid").val();
var deliveryPoint = $("#QuoteDeliveryPoint").val(); var deliveryPoint = $("#QuoteDeliveryPoint").val();
@ -334,7 +328,7 @@ $('.generateCommercialComments').live('click', function(event) {
var commList = commComments.find('ol'); var commList = commComments.find('ol');
commList.append('<li>DELIVERY IS ESTIMATED AT '+deliveryTime+ 'FROM RECEIPT OF YOUR TECHNICALLY AND COMMERCIALLY CLEAR ORDER'); commList.append('<li>DELIVERY IS ESTIMATED AT '+deliveryTime+ ' '+deliveryTF+ ' FROM RECEIPT OF YOUR TECHNICALLY AND COMMERCIALLY CLEAR ORDER');
commList.append('<li>PAYMENT TERMS: '+paymentTerms+'</li>'); commList.append('<li>PAYMENT TERMS: '+paymentTerms+'</li>');
commList.append('<li>QUOTATION IS VALID <u>FOR '+daysValid+' DAYS</li>'); commList.append('<li>QUOTATION IS VALID <u>FOR '+daysValid+' DAYS</li>');
commList.append('<li>ALL PRICES ARE <u>'+deliveryPoint+'</u></li>'); commList.append('<li>ALL PRICES ARE <u>'+deliveryPoint+'</u></li>');