|
@@ -255,7 +255,7 @@ class GenerateDocumentsService
|
|
|
$spreadsheet = $reader->load($inputFileName);
|
|
$spreadsheet = $reader->load($inputFileName);
|
|
|
$sheet = $spreadsheet->getActiveSheet();
|
|
$sheet = $spreadsheet->getActiveSheet();
|
|
|
|
|
|
|
|
- $address = 'г. Москва, ' . $order->district->shortname . ', район ' . $order->area->name . ', по адресу: ' . $order->object_address;
|
|
|
|
|
|
|
+ $address = 'г. Москва, ' . $order->district->shortname . ', район ' . $order->area->name . ', по адресу: ' . (filled(trim((string) $order->name)) ? $order->name : $order->object_address);
|
|
|
$i = 1; // start of table
|
|
$i = 1; // start of table
|
|
|
$n = 1;
|
|
$n = 1;
|
|
|
foreach ($order->products_sku as $sku) {
|
|
foreach ($order->products_sku as $sku) {
|
