|
@@ -130,7 +130,7 @@ discard block |
|
|
block discarded – undo |
|
130
|
130
|
} |
|
131
|
131
|
} |
|
132
|
132
|
|
|
133
|
|
- $peopleemployee = $this->em->getRepository(PeopleLink::class)->findOneBy(['company' => $company, 'employee' => $userPeople]); |
|
|
133
|
+ $peopleemployee = $this->em->getRepository(PeopleLink::class)->findOneBy(['company' => $company, 'employee' => $userPeople]); |
|
134
|
134
|
|
|
135
|
135
|
$permissions[$company->getId()][] = 'salesman'; |
|
136
|
136
|
$myCompanies[$company->getId()] = [ |
|
@@ -158,7 +158,7 @@ discard block |
|
|
block discarded – undo |
|
158
|
158
|
$myCompanies[$key]['permission'] = array_values($permission); |
|
159
|
159
|
} |
|
160
|
160
|
|
|
161
|
|
- usort($myCompanies, function ($a, $b) { |
|
|
161
|
+ usort($myCompanies, function($a, $b) { |
|
162
|
162
|
|
|
163
|
163
|
if ($a['alias'] == $b['alias']) { |
|
164
|
164
|
return 0; |
|
@@ -204,11 +204,11 @@ discard block |
|
|
block discarded – undo |
|
204
|
204
|
$p_m[$package_module->getId()]['module'] = $package_module->getModule()->getName(); |
|
205
|
205
|
} |
|
206
|
206
|
|
|
207
|
|
- $packages[$people_package->getId()]['id'] = $people_package->getId(); |
|
208
|
|
- $packages[$people_package->getId()]['package']['id'] = $package->getId(); |
|
209
|
|
- $packages[$people_package->getId()]['package']['name'] = $package->getName(); |
|
210
|
|
- $packages[$people_package->getId()]['package']['active'] = $package->isActive() ? true : false; |
|
211
|
|
- $packages[$people_package->getId()]['package']['modules'] = $p_m; |
|
|
207
|
+ $packages[$people_package->getId()]['id'] = $people_package->getId(); |
|
|
208
|
+ $packages[$people_package->getId()]['package']['id'] = $package->getId(); |
|
|
209
|
+ $packages[$people_package->getId()]['package']['name'] = $package->getName(); |
|
|
210
|
+ $packages[$people_package->getId()]['package']['active'] = $package->isActive() ? true : false; |
|
|
211
|
+ $packages[$people_package->getId()]['package']['modules'] = $p_m; |
|
212
|
212
|
} |
|
213
|
213
|
|
|
214
|
214
|
return $packages; |
|
@@ -243,7 +243,7 @@ discard block |
|
|
block discarded – undo |
|
243
|
243
|
/** |
|
244
|
244
|
* @var \ControleOnline\Entity\Document $document |
|
245
|
245
|
*/ |
|
246
|
|
- $documents = $documents->filter(function ($document) { |
|
|
246
|
+ $documents = $documents->filter(function($document) { |
|
247
|
247
|
return $document->getDocumentType()->getDocumentType() == 'CNPJ'; |
|
248
|
248
|
}); |
|
249
|
249
|
|