Commit 19f555c2 by Cam Hayes

v0.9.15.12 deployed

Fixed issue with MEMO custom field being special instructions rather than name
parent 1cbf643f
......@@ -245,7 +245,7 @@ var
TxnTaxCodeRef: TJSONObject;
TxnTaxDetail: TJSONObject;
JSONData: TJSONObject;
ORDER_ID, companyID, RefreshToken, AccessToken, USER_ID, MemoField: string;
ORDER_ID, companyID, RefreshToken, AccessToken, USER_ID: string;
table, msg: string;
ShipMethodRef: TJSONObject;
LastRefresh: TDateTime;
......@@ -281,7 +281,7 @@ begin
SQL := 'select * from orders where ORDER_ID = ' + ORDER_ID;
logger.Log(5, 'Retrieving order type with SQL: ' + SQL);
doQuery(ordersDB.UniQuery1, SQL);
MemoField := 'general_special_instructions';
if ordersDB.UniQuery1.FieldByName('ORDER_TYPE').AsString = 'corrugated_plate' then
begin
table := 'corrugated_plate_orders';
......@@ -289,10 +289,7 @@ begin
else if ordersDB.UniQuery1.FieldByName('ORDER_TYPE').AsString = 'web_plate' then
begin
table := 'web_plate_orders';
MemoField := 'general_comments';
end
else
table := 'cutting_die_orders';
end;
SQL := 'select * from ' + table + ' cpo join customers c on cpo.COMPANY_ID = c.CUSTOMER_ID join customers_ship cs on cpo.staff_fields_ship_to = cs.ship_block JOIN qb_items ON cpo.staff_fields_quickbooks_item = qb_items.qb_item_name where cpo.ORDER_ID = ' + ORDER_ID;
logger.Log(5, 'Retrieveing Customer Info with SQL: ' + SQL);
......@@ -336,11 +333,11 @@ begin
CustomField.AddPair('Type', ordersDB.UniQuery2.FieldByName('CUST_FIELD_TYPE').AsString);
if ordersDB.UniQuery2.FieldByName('CUST_FIELD_NAME').AsString = 'CUSTID' then
CustomField.AddPair('StringValue', ordersDB.UniQuery1.FieldByName('SHORT_NAME').AsString)
CustomField.AddPair('StringValue', Copy(ordersDB.UniQuery1.FieldByName('SHORT_NAME').AsString, 1, 31))
else if ordersDB.UniQuery2.FieldByName('CUST_FIELD_NAME').AsString = 'MEMO' then
CustomField.AddPair('StringValue', Copy(ordersDB.UniQuery1.FieldByName(MemoField).AsString, 1, 31))
CustomField.AddPair('StringValue', Copy(ordersDB.UniQuery1.FieldByName('staff_fields_job_name').AsString, 1, 31))
else if ordersDB.UniQuery2.FieldByName('CUST_FIELD_NAME').AsString = 'CUSTOMER PO#' then
CustomField.AddPair('StringValue', ordersDB.UniQuery1.FieldByName('staff_fields_po_number').AsString);
CustomField.AddPair('StringValue', Copy(ordersDB.UniQuery1.FieldByName('staff_fields_po_number').AsString, 1, 31));
CustomFields.AddElement(CustomField);
......
......@@ -114,11 +114,11 @@
<VerInfo_Locale>1033</VerInfo_Locale>
<DCC_ExeOutput>.\bin</DCC_ExeOutput>
<DCC_UnitSearchPath>C:\RADTOOLS\FastMM4;$(DCC_UnitSearchPath)</DCC_UnitSearchPath>
<VerInfo_Keys>CompanyName=EM Systems;FileDescription=$(MSBuildProjectName);FileVersion=0.9.15.11;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=0.9.11;Comments=</VerInfo_Keys>
<VerInfo_Keys>CompanyName=EM Systems;FileDescription=$(MSBuildProjectName);FileVersion=0.9.15.12;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=0.9.11;Comments=</VerInfo_Keys>
<VerInfo_MajorVer>0</VerInfo_MajorVer>
<VerInfo_MinorVer>9</VerInfo_MinorVer>
<VerInfo_Release>15</VerInfo_Release>
<VerInfo_Build>11</VerInfo_Build>
<VerInfo_Build>12</VerInfo_Build>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
<AppDPIAwarenessMode>PerMonitorV2</AppDPIAwarenessMode>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment