adjust json_string
This commit is contained in:
parent
044fda9d16
commit
74b976b367
@ -16,8 +16,8 @@
|
||||
"Codes": [
|
||||
<#list lv.id_list as id>
|
||||
{
|
||||
"Key": "${id.logistical_variant_ID_type_code?json_string!""}",
|
||||
"Value": "${id.logistical_variant_ID_code?json_string!""}"
|
||||
"Key": "${(id.logistical_variant_ID_type_code!"")?json_string}",
|
||||
"Value": "${(id.logistical_variant_ID_code!"")?json_string}"
|
||||
}<#sep>,</#sep>
|
||||
</#list>
|
||||
],
|
||||
|
||||
@ -39,8 +39,8 @@
|
||||
"Codes": [
|
||||
<#list logistical_variant.id_list as id>
|
||||
{
|
||||
"Key": "${id.logistical_variant_ID_type_code?json_string!""}",
|
||||
"Value": "${id.logistical_variant_ID_code?json_string!""}"
|
||||
"Key": "${(id.logistical_variant_ID_type_code!"")?json_string}",
|
||||
"Value": "${(id.logistical_variant_ID_code!"")?json_string}"
|
||||
}<#sep>,</#sep>
|
||||
</#list>
|
||||
],
|
||||
|
||||
@ -52,23 +52,23 @@
|
||||
<#else>
|
||||
"Actor":
|
||||
{
|
||||
"Name" : "${preparation_order.address.name_or_company_name?json_string!""}",
|
||||
"Name" : "${(preparation_order.address.name_or_company_name!"")?json_string}",
|
||||
"Address" :
|
||||
{
|
||||
"City" : "${preparation_order.address.post_code_area_name?json_string!""}",
|
||||
"City" : "${(preparation_order.address.post_code_area_name!"")?json_string}",
|
||||
"CountryCode" : "${preparation_order.address.iso_country_code!""}",
|
||||
"PostalCode" : "${preparation_order.address.postal_code!""}",
|
||||
"StreetAddressOne" : "${preparation_order.address.street_and_number_and_po_box?json_string!""}",
|
||||
"StreetAddressTwo" : "${preparation_order.address.additional_address_data_1?json_string!""}",
|
||||
"StreetAddressThree" : "${preparation_order.address.additional_address_data_2?json_string!""}"
|
||||
"StreetAddressOne" : "${(preparation_order.address.street_and_number_and_po_box!"")?json_string}",
|
||||
"StreetAddressTwo" : "${(preparation_order.address.additional_address_data_1!"")?json_string}",
|
||||
"StreetAddressThree" : "${(preparation_order.address.additional_address_data_2!"")?json_string}"
|
||||
}
|
||||
},
|
||||
"Contact" :
|
||||
{
|
||||
"FirstName" : "${preparation_order.address.first_name?json_string!""}",
|
||||
"LastName" : "${preparation_order.address.last_name?json_string!""}",
|
||||
"Emails" : ${splitEmailsIntoArray(preparation_order.address.mail_address!""?json_string)},
|
||||
"Phones" : ["${preparation_order.address.mobile_phone_number?json_string!""}","${preparation_order.address.land_line_phone_number?json_string!""}", "${preparation_order.address.fax_number?json_string!""}" ]
|
||||
"FirstName" : "${(preparation_order.address.first_name!"")?json_string}",
|
||||
"LastName" : "${(preparation_order.address.last_name!"")?json_string}",
|
||||
"Emails" : ${splitEmailsIntoArray((preparation_order.address.mail_address!"")?json_string)},
|
||||
"Phones" : ["${(preparation_order.address.mobile_phone_number!"")?json_string}","${(preparation_order.address.land_line_phone_number!"")?json_string}", "${(preparation_order.address.fax_number!"")?json_string}" ]
|
||||
}
|
||||
</#if>
|
||||
},
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
</#if>
|
||||
|
||||
{
|
||||
"id" : {"refid" : "${executionflow.OrderID}"},
|
||||
"id" : {"refid" : "${executionflow.OrderID?json_string}"},
|
||||
"route" : "rest/public/v1/activities/{activity_code}/physical_depots/{physical_depot_code}/originators/{originator_code}/preparation_orders",
|
||||
"method" : "POST",
|
||||
"uri_substitutions": {
|
||||
@ -25,7 +25,7 @@
|
||||
},
|
||||
"payload" :
|
||||
{
|
||||
"originator_reference": "${executionflow.OrderID}",
|
||||
"originator_reference": "${executionflow.OrderID?json_string}",
|
||||
"preparation_type_code": "${preparation_type_code}",
|
||||
"end_consignee_code": "${actorID}",
|
||||
<#if executionflow.RequestedMilestones?? && executionflow.RequestedMilestones.RequestedDeliveryDateTime??>
|
||||
@ -52,21 +52,21 @@
|
||||
"title_code" : "${titlecode}",
|
||||
"contact_type_code" : "${contacttypecode}",
|
||||
"address_type_code" : "${adresstypecode}",
|
||||
"first_name": "${executionflow.ShipTo.Contact.FirstName!""?json_string}",
|
||||
"last_name" :"${executionflow.ShipTo.Contact.LastName!""?json_string}",
|
||||
"name_or_company_name" : "${executionflow.ShipTo.Contact.FirstName!""?json_string} ${executionflow.ShipTo.Contact.LastName!""?json_string}",
|
||||
"first_name": "${(executionflow.ShipTo.Contact.FirstName!"")?json_string}",
|
||||
"last_name" :"${(executionflow.ShipTo.Contact.LastName!"")?json_string}",
|
||||
"name_or_company_name" : "${(executionflow.ShipTo.Contact.FirstName!"")?json_string} ${(executionflow.ShipTo.Contact.LastName!"")?json_string}",
|
||||
<#if executionflow.ShipTo.Contact.Emails?? && executionflow.ShipTo.Contact.Emails[0]!="">
|
||||
"mail_address": "${executionflow.ShipTo.Contact.Emails[0]}",
|
||||
</#if>
|
||||
<#if executionflow.ShipTo.Contact.Phones?? && executionflow.ShipTo.Contact.Phones[0]!="">
|
||||
"mobile_phone_number": "${executionflow.ShipTo.Contact.Phones[0]}",
|
||||
</#if>
|
||||
"street_and_number_and_po_box": "${executionflow.ShipTo.Actor.Address.StreetAddressOne!""?json_string}",
|
||||
"additional_address_data_1": "${executionflow.ShipTo.Actor.Address.StreetAddressTwo!""?json_string}",
|
||||
"additional_address_data_2": "${executionflow.ShipTo.Actor.Address.StreetAddressThree!""?json_string}",
|
||||
"postal_code": "${executionflow.ShipTo.Actor.Address.PostalCode!""}",
|
||||
"post_code_area_name" : "${executionflow.ShipTo.Actor.Address.City!""}",
|
||||
"iso_country_code": "${executionflow.ShipTo.Actor.Address.CountryCode!""}"
|
||||
"street_and_number_and_po_box": "${(executionflow.ShipTo.Actor.Address.StreetAddressOne!"")?json_string}",
|
||||
"additional_address_data_1": "${(executionflow.ShipTo.Actor.Address.StreetAddressTwo!"")?json_string}",
|
||||
"additional_address_data_2": "${(executionflow.ShipTo.Actor.Address.StreetAddressThree!"")?json_string}",
|
||||
"postal_code": "${(executionflow.ShipTo.Actor.Address.PostalCode!"")?json_string}",
|
||||
"post_code_area_name" : "${(executionflow.ShipTo.Actor.Address.City!"")?json_string}",
|
||||
"iso_country_code": "${(executionflow.ShipTo.Actor.Address.CountryCode!"")?json_string}"
|
||||
}
|
||||
</#if>
|
||||
<#if executionflow.Lines??>
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<#include "RPtoRFX_Receipt_DefaultHeaderData.ftl">
|
||||
|
||||
{
|
||||
"id" : {"refid" : "${executionflow.OrderID}"},
|
||||
"id" : {"refid" : "${executionflow.OrderID?json_string}"},
|
||||
"route" : "rest/public/v1/activities/{activity_code}/physical_depots/{physical_depot_code}/originators/{originator_code}/receipts",
|
||||
"method" : "POST",
|
||||
"uri_substitutions": {
|
||||
@ -11,7 +11,7 @@
|
||||
},
|
||||
"payload" :
|
||||
{
|
||||
"receipt_reference": "${executionflow.OrderID}",
|
||||
"receipt_reference": "${executionflow.OrderID?json_string}",
|
||||
"receipt_type": "${receipt_type}",
|
||||
"receipt_reason_code": "${receipt_reason_code}",
|
||||
"work_mode_code" : "${work_mode_code}",
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user