|
|
@@ -146,7 +146,7 @@
|
|
|
recipient:'{{$waybill->recipient}}',
|
|
|
recipient_mobile:'{{$waybill->recipient_mobile}}',
|
|
|
charge:'{{$waybill->charge}}',
|
|
|
- ordering_remark:'{{$waybill->ordering_remark}}',
|
|
|
+ ordering_remark:'{{preg_replace("/[\n\s]/",' ',($waybill->ordering_remark??""))}}',
|
|
|
carrier:'{{$waybill->carrier ? $waybill->carrier->name : ''}}',
|
|
|
carrier_bill:'{{$waybill->carrier_bill}}',
|
|
|
origination_city:'{{$waybill->origination_city ? $waybill->origination_city->name : ''}}',
|