Fixed document_add_edit which got broken in a bad merge
This commit is contained in:
Karl Cordes
parent
2d8b251cc6
commit
47c9cf2ba5
|
|
@ -332,6 +332,7 @@ class EnquiriesController extends AppController {
|
|||
}
|
||||
else {
|
||||
$this->set('smtp_errors', $this->Email->smtpError);
|
||||
die(print_r($this->Email->smtpError));
|
||||
$this->Session->setFlash(__('The Enquiry has been added but email to the contact has NOT been sent. Something went wrong.', true));
|
||||
$this->redirect(array('action'=>'view/'.$id), null, false);
|
||||
|
||||
|
|
|
|||
|
|
@ -13,24 +13,6 @@ $(function() {
|
|||
loadLineItems();
|
||||
var docID = $('#documentID').html();
|
||||
|
||||
<<<<<<< HEAD
|
||||
|
||||
$("#flashMessage").hide();
|
||||
|
||||
$("#lineItemDetails").hide();
|
||||
|
||||
$( "#addLineItemModal" ).dialog({
|
||||
autoOpen: false,
|
||||
height: 900,
|
||||
width: 600,
|
||||
modal: true,
|
||||
buttons: {
|
||||
"Add Line Item": function() {
|
||||
|
||||
$('#LineItemDescription').ckeditor(function() {
|
||||
this.updateElement();
|
||||
});
|
||||
=======
|
||||
|
||||
$("#flashMessage").hide();
|
||||
|
||||
|
|
@ -48,73 +30,9 @@ $(function() {
|
|||
this.updateElement();
|
||||
});
|
||||
|
||||
>>>>>>> b15eee9619754852ad75ae598103249c33343064
|
||||
|
||||
var thisLineItemInputs = $('#LineItemAddForm').find('input,select,textarea');
|
||||
|
||||
<<<<<<< HEAD
|
||||
var thisLineItemInputs = $('#LineItemAddForm').find('input,select,textarea');
|
||||
|
||||
$.post('/line_items/ajax_add', thisLineItemInputs, function(data) {
|
||||
|
||||
if(data == 'SUCCESS') {
|
||||
loadLineItems();
|
||||
$( "#addLineItemModal" ).dialog('close');
|
||||
}
|
||||
else {
|
||||
alert("Line Item could not be saved")
|
||||
$('#LineItemDescription').ckeditor(config);
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
},
|
||||
Cancel: function() {
|
||||
$( this ).dialog( "close" );
|
||||
}
|
||||
},
|
||||
close: function() {
|
||||
loadLineItems();
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
$( "#editLineItemModal" ).dialog({
|
||||
autoOpen: false,
|
||||
height: 900,
|
||||
width: 600,
|
||||
modal: true,
|
||||
buttons: {
|
||||
"Edit Line Item": function() {
|
||||
$('#LineItemDescription').ckeditor(function() {
|
||||
this.updateElement();
|
||||
});
|
||||
|
||||
var thisLineItemInputs = $('#LineItemEditForm').find('input,select,textarea');
|
||||
|
||||
$.post('/line_items/ajax_edit', thisLineItemInputs, function(data) {
|
||||
if(data == 'SUCCESS') {
|
||||
$( "#editLineItemModal" ).dialog('close');
|
||||
}
|
||||
else {
|
||||
alert("Line Item could not be saved")
|
||||
$('#LineItemDescription').ckeditor(config);
|
||||
}
|
||||
});
|
||||
|
||||
},
|
||||
Cancel: function() {
|
||||
$( "#editLineItemModal" ).dialog('close');
|
||||
|
||||
}
|
||||
},
|
||||
close: function() {
|
||||
loadLineItems();
|
||||
|
||||
}
|
||||
});
|
||||
|
||||
=======
|
||||
$.post('/line_items/ajax_add', thisLineItemInputs, function(data) {
|
||||
|
||||
if(data == 'SUCCESS') {
|
||||
|
|
@ -182,30 +100,13 @@ $(function() {
|
|||
modal: true,
|
||||
buttons: {
|
||||
"Edit Quote Details": function() {
|
||||
>>>>>>> b15eee9619754852ad75ae598103249c33343064
|
||||
|
||||
$( "#QuoteDetails" ).dialog({
|
||||
autoOpen: false,
|
||||
height: 900,
|
||||
width: 600,
|
||||
modal: true,
|
||||
buttons: {
|
||||
"Edit Quote Details": function() {
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
$('#QuoteCommercialComments').ckeditor(function() {
|
||||
this.updateElement();
|
||||
this.destroy();
|
||||
});
|
||||
>>>>>>> b15eee9619754852ad75ae598103249c33343064
|
||||
|
||||
$('#QuoteCommercialComments').ckeditor(function() {
|
||||
this.updateElement();
|
||||
this.destroy();
|
||||
});
|
||||
|
||||
<<<<<<< HEAD
|
||||
|
||||
var quoteInputs = $('#QuoteEditForm').find('input,select,textarea');
|
||||
|
||||
|
|
@ -223,36 +124,8 @@ $(function() {
|
|||
loadLineItems();
|
||||
}
|
||||
});
|
||||
=======
|
||||
var quoteInputs = $('#QuoteEditForm').find('input,select,textarea');
|
||||
|
||||
$.post('/quotes/ajax_edit', quoteInputs, function(data) {
|
||||
$( "#QuoteDetails" ).dialog('close');
|
||||
});
|
||||
|
||||
},
|
||||
Cancel: function() {
|
||||
$( this ).dialog( "close" );
|
||||
|
||||
}
|
||||
},
|
||||
close: function() {
|
||||
loadLineItems();
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
>>>>>>> b15eee9619754852ad75ae598103249c33343064
|
||||
|
||||
$( "#addJobConfirmation" ).dialog({
|
||||
autoOpen: false,
|
||||
height: 400,
|
||||
width: 400,
|
||||
modal: true,
|
||||
buttons: {
|
||||
"Create New Job and Order Acknowledgement": function() {
|
||||
|
||||
<<<<<<< HEAD
|
||||
|
||||
$( "#addJobConfirmation" ).dialog({
|
||||
autoOpen: false,
|
||||
|
|
@ -263,22 +136,12 @@ $(function() {
|
|||
"Create New Job and Order Acknowledgement": function() {
|
||||
|
||||
var documentID = $("#documentID").html();
|
||||
=======
|
||||
var documentID = $("#documentID").html();
|
||||
|
||||
//window.location.href = "/documents/convert_to_oa/"+documentID;
|
||||
//var newOAform = $('#DocumentConvertToOaForm').find('input');
|
||||
var newOAform = $('#DocumentConvertToOaForm');
|
||||
newOAform.submit();
|
||||
|
||||
>>>>>>> b15eee9619754852ad75ae598103249c33343064
|
||||
|
||||
//window.location.href = "/documents/convert_to_oa/"+documentID;
|
||||
//var newOAform = $('#DocumentConvertToOaForm').find('input');
|
||||
var newOAform = $('#DocumentConvertToOaForm');
|
||||
newOAform.submit();
|
||||
|
||||
<<<<<<< HEAD
|
||||
|
||||
|
||||
/*$.post('/documents/convert_to_oa', newOAform, function(data) {
|
||||
|
|
@ -292,21 +155,6 @@ $(function() {
|
|||
$("#flashMessage").show();
|
||||
|
||||
|
||||
loadLineItems();
|
||||
});
|
||||
*/
|
||||
=======
|
||||
/*$.post('/documents/convert_to_oa', newOAform, function(data) {
|
||||
if(data =='SUCCESS') {
|
||||
$("#flashMessage").html("Invoice Saved Successfully");
|
||||
}
|
||||
else {
|
||||
$("#flashMessage").html("Unable to Save Invoice");
|
||||
}
|
||||
|
||||
$("#flashMessage").show();
|
||||
|
||||
|
||||
loadLineItems();
|
||||
});
|
||||
*/
|
||||
|
|
@ -315,7 +163,6 @@ $(function() {
|
|||
},
|
||||
Cancel: function() {
|
||||
$( this ).dialog( "close" );
|
||||
>>>>>>> b15eee9619754852ad75ae598103249c33343064
|
||||
|
||||
}
|
||||
},
|
||||
|
|
@ -323,21 +170,6 @@ $(function() {
|
|||
}
|
||||
});
|
||||
|
||||
<<<<<<< HEAD
|
||||
},
|
||||
Cancel: function() {
|
||||
$( this ).dialog( "close" );
|
||||
|
||||
}
|
||||
},
|
||||
close: function() {
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
$("#pageContentFactory").hide();
|
||||
|
||||
=======
|
||||
|
||||
$("#pageContentFactory").hide();
|
||||
|
||||
|
|
@ -359,42 +191,8 @@ $(function() {
|
|||
$('#LineItemDescription').ckeditor(function() {
|
||||
this.destroy();
|
||||
});
|
||||
>>>>>>> b15eee9619754852ad75ae598103249c33343064
|
||||
|
||||
//Add a new Page Element.
|
||||
$("#addPage").button().click(function(event) {
|
||||
event.preventDefault();
|
||||
|
||||
<<<<<<< HEAD
|
||||
newPage(false);
|
||||
return false;
|
||||
});
|
||||
|
||||
|
||||
//Open the LineItem dialog
|
||||
$(".addLineItem").button().click(function() {
|
||||
|
||||
|
||||
|
||||
$('#LineItemDescription').ckeditor(function() {
|
||||
this.destroy();
|
||||
});
|
||||
=======
|
||||
$("#editLineItemModal").empty();
|
||||
|
||||
|
||||
|
||||
var nextItemNo = $(".lineItem").length;
|
||||
nextItemNo++;
|
||||
|
||||
$.get('/line_items/add/'+docID, function(data) {
|
||||
$("#addLineItemModal").html(data);
|
||||
|
||||
>>>>>>> b15eee9619754852ad75ae598103249c33343064
|
||||
|
||||
$("#LineItemItemNumber").val(nextItemNo); //Auto fill in the next Item No
|
||||
|
||||
<<<<<<< HEAD
|
||||
$("#editLineItemModal").empty();
|
||||
|
||||
|
||||
|
|
@ -408,7 +206,6 @@ $(function() {
|
|||
|
||||
$("#LineItemItemNumber").val(nextItemNo); //Auto fill in the next Item No
|
||||
|
||||
=======
|
||||
|
||||
$("#productDetails").hide();
|
||||
|
||||
|
|
@ -425,17 +222,8 @@ $(function() {
|
|||
|
||||
|
||||
$(".editLineItem").live('click', function() {
|
||||
>>>>>>> b15eee9619754852ad75ae598103249c33343064
|
||||
|
||||
$("#productDetails").hide();
|
||||
|
||||
<<<<<<< HEAD
|
||||
$('#LineItemDescription').ckeditor(config);
|
||||
|
||||
showHideTextPrices();
|
||||
|
||||
$( "#addLineItemModal" ).dialog('open');
|
||||
=======
|
||||
$('#LineItemDescription').ckeditor(function() {
|
||||
this.destroy();
|
||||
});
|
||||
|
|
@ -449,107 +237,11 @@ $(function() {
|
|||
$('#LineItemDescription').ckeditor(config);
|
||||
showHideTextPrices();
|
||||
$( "#editLineItemModal" ).dialog('open');
|
||||
>>>>>>> b15eee9619754852ad75ae598103249c33343064
|
||||
|
||||
});
|
||||
});
|
||||
|
||||
<<<<<<< HEAD
|
||||
return false;
|
||||
});
|
||||
|
||||
|
||||
$(".editLineItem").live('click', function() {
|
||||
|
||||
|
||||
$('#LineItemDescription').ckeditor(function() {
|
||||
this.destroy();
|
||||
=======
|
||||
|
||||
$("#principleSelect").live('change',function() {
|
||||
|
||||
var principleID = getSelectedID('#principleSelect');
|
||||
|
||||
$("#productDetails").hide();
|
||||
|
||||
$.get('/documents/getProducts/'+principleID, function(data) {
|
||||
$('#productsDiv').html(data);
|
||||
>>>>>>> b15eee9619754852ad75ae598103249c33343064
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
$("#productSelect").live('change',function() {
|
||||
|
||||
var productID = getSelectedID('#productSelect');
|
||||
|
||||
|
||||
<<<<<<< HEAD
|
||||
$("#addLineItemModal").empty();
|
||||
|
||||
var thisLineItemID = $(this).parent('td').attr('id');
|
||||
$.get('/line_items/edit/'+thisLineItemID, function(data) {
|
||||
$("#editLineItemModal").html(data);
|
||||
$("#productDetails").hide();
|
||||
$('#LineItemDescription').ckeditor(config);
|
||||
showHideTextPrices();
|
||||
$( "#editLineItemModal" ).dialog('open');
|
||||
=======
|
||||
$.get('/documents/getProductDetails/'+productID, function(data) {
|
||||
|
||||
$("#lineItemDetails").show();
|
||||
$("#LineItemProductId").val(data.id);
|
||||
$("#LineItemTitle").val(data.title);
|
||||
>>>>>>> b15eee9619754852ad75ae598103249c33343064
|
||||
|
||||
var descText = '';
|
||||
if(data.item_code) {
|
||||
descText = descText + '<br><b>Item Code:</b> ' + data.item_code;
|
||||
}
|
||||
|
||||
if(data.item_description) {
|
||||
descText = descText + '<br><b>Item Description:</b> ' + data.item_description + '<br>';
|
||||
|
||||
}
|
||||
|
||||
descText = descText + data.description;
|
||||
|
||||
$("#LineItemDescription").val(descText);
|
||||
|
||||
|
||||
}, "json");
|
||||
});
|
||||
|
||||
|
||||
// Initialize the editor.
|
||||
// Callback function can be passed and executed after full instance creation.
|
||||
$('.page').ckeditor(config);
|
||||
|
||||
|
||||
$("#LineItemHasTextPrices").live('change', function() {
|
||||
showHideTextPrices();
|
||||
});
|
||||
|
||||
|
||||
//Remove this Page
|
||||
$(".removePage").live('click',function() {
|
||||
|
||||
$('.page').ckeditor(function() {
|
||||
this.destroy();
|
||||
});
|
||||
});
|
||||
|
||||
$(this).parents(".docPage").remove();
|
||||
|
||||
$('.page').ckeditor(config);
|
||||
|
||||
});
|
||||
|
||||
|
||||
$("#savePages").click(function() {
|
||||
savePages();
|
||||
|
||||
<<<<<<< HEAD
|
||||
$("#principleSelect").live('change',function() {
|
||||
|
||||
var principleID = getSelectedID('#principleSelect');
|
||||
|
|
@ -620,22 +312,6 @@ $(function() {
|
|||
});
|
||||
});
|
||||
|
||||
=======
|
||||
});
|
||||
|
||||
|
||||
$(".quickpricing").live('change', function() {
|
||||
calculateQuickPrices();
|
||||
});
|
||||
|
||||
|
||||
$('.removeLineItem').live('click', function() {
|
||||
var thisLineItemID = $(this).parent('td').attr('id');
|
||||
$.post('/line_items/ajax_delete/'+thisLineItemID, function(data) {
|
||||
loadLineItems();
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
$("#editQuoteDetails").click(function() {
|
||||
var quoteID = $("#quoteID").html();
|
||||
|
|
@ -655,19 +331,8 @@ $(function() {
|
|||
$("#QuoteDetails").dialog('open');
|
||||
});
|
||||
});
|
||||
>>>>>>> b15eee9619754852ad75ae598103249c33343064
|
||||
|
||||
$("#editQuoteDetails").click(function() {
|
||||
var quoteID = $("#quoteID").html();
|
||||
|
||||
<<<<<<< HEAD
|
||||
$('#QuoteCommercialComments').ckeditor(function() {
|
||||
this.destroy();
|
||||
});
|
||||
|
||||
$.get('/quotes/edit/'+quoteID, function(data) {
|
||||
|
||||
=======
|
||||
$("#generateFirstPage").click(function() {
|
||||
|
||||
if($(".firstPage").length == 0) {
|
||||
|
|
@ -678,35 +343,8 @@ $(function() {
|
|||
$(".firstPage").val(data);
|
||||
savePages();
|
||||
});
|
||||
>>>>>>> b15eee9619754852ad75ae598103249c33343064
|
||||
|
||||
|
||||
$("#QuoteDetails").html(data);
|
||||
|
||||
<<<<<<< HEAD
|
||||
$('#QuoteCommercialComments').ckeditor(config);
|
||||
|
||||
$("#QuoteDetails").dialog('open');
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
$("#generateFirstPage").click(function() {
|
||||
=======
|
||||
});
|
||||
>>>>>>> b15eee9619754852ad75ae598103249c33343064
|
||||
|
||||
if($(".firstPage").length == 0) {
|
||||
newPage(true);
|
||||
}
|
||||
|
||||
$.get('/documents/generateFirstPage/'+docID, function(data) {
|
||||
$(".firstPage").val(data);
|
||||
savePages();
|
||||
});
|
||||
|
||||
<<<<<<< HEAD
|
||||
|
||||
|
||||
});
|
||||
|
||||
|
|
@ -738,35 +376,6 @@ $(function() {
|
|||
$("#flashMessage").show();
|
||||
|
||||
|
||||
=======
|
||||
//Invoice View
|
||||
$('#shippingDetails').ckeditor(config);
|
||||
|
||||
$("#DocumentBillTo").ckeditor(config);
|
||||
$("#DocumentShipTo").ckeditor(config);
|
||||
|
||||
$("#saveInvoiceButton").click(function() {
|
||||
|
||||
|
||||
|
||||
updateTextFields(); //Update the CKEditor instances.
|
||||
|
||||
var invoiceDetails = $('#DocumentEditForm').find('input,select,textarea');
|
||||
|
||||
|
||||
|
||||
$.post('/documents/ajax_edit', invoiceDetails, function(data) {
|
||||
if(data =='SUCCESS') {
|
||||
$("#flashMessage").html("Invoice Saved Successfully");
|
||||
}
|
||||
else {
|
||||
$("#flashMessage").html("Unable to Save Invoice");
|
||||
}
|
||||
|
||||
$("#flashMessage").show();
|
||||
|
||||
|
||||
>>>>>>> b15eee9619754852ad75ae598103249c33343064
|
||||
loadLineItems();
|
||||
});
|
||||
|
||||
|
|
@ -964,7 +573,6 @@ function calculateQuickPrices() {
|
|||
var discount_amount_total = $("#LineItemDiscountAmountTotal").val();
|
||||
var gross_price = $("#LineItemGrossPrice").val();
|
||||
var net_price = $("#LineItemNetPrice").val();
|
||||
<<<<<<< HEAD
|
||||
|
||||
gross_price = quantity * gross_unit_price;
|
||||
$("#LineItemGrossPrice").val(gross_price);
|
||||
|
|
@ -980,23 +588,6 @@ function calculateQuickPrices() {
|
|||
$("#LineItemNetPrice").val(net_price);
|
||||
|
||||
|
||||
=======
|
||||
|
||||
gross_price = quantity * gross_unit_price;
|
||||
$("#LineItemGrossPrice").val(gross_price);
|
||||
|
||||
discount_amount_unit = (discount_percent/100) * gross_unit_price;
|
||||
discount_amount_unit = discount_amount_unit.toFixed(2);
|
||||
|
||||
discount_amount_total = (discount_percent/100) * gross_price;
|
||||
discount_amount_total = discount_amount_total.toFixed(2);
|
||||
$("#LineItemDiscountAmountTotal").val(discount_amount_total);
|
||||
|
||||
net_price = gross_price - discount_amount_total;
|
||||
$("#LineItemNetPrice").val(net_price);
|
||||
|
||||
|
||||
>>>>>>> b15eee9619754852ad75ae598103249c33343064
|
||||
$("#LineItemDiscountAmountUnit").val(discount_amount_unit);
|
||||
net_unit_price = gross_unit_price - discount_amount_unit;
|
||||
$("#LineItemNetUnitPrice").val(net_unit_price);
|
||||
|
|
@ -1042,13 +633,7 @@ function checkNaN(value) {
|
|||
else {
|
||||
return value;
|
||||
}
|
||||
<<<<<<< HEAD
|
||||
|
||||
|
||||
|
||||
=======
|
||||
|
||||
|
||||
|
||||
>>>>>>> b15eee9619754852ad75ae598103249c33343064
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue