@@ -112,31 +112,31 @@ discard block |
||
112 | 112 | |
113 | 113 | case 'active': |
114 | 114 | |
115 | - $queryBuilder->innerJoin(Order::class, 'O' , 'WITH', 'O.client = myclients.id'); |
|
116 | - $queryBuilder->innerJoin(People::class, 'C' , 'WITH', 'C.id = O.provider'); |
|
115 | + $queryBuilder->innerJoin(Order::class, 'O', 'WITH', 'O.client = myclients.id'); |
|
116 | + $queryBuilder->innerJoin(People::class, 'C', 'WITH', 'C.id = O.provider'); |
|
117 | 117 | $queryBuilder->innerJoin(PeopleSalesman::class, 'kkk', 'WITH', 'kkk.company = C.id'); |
118 | - $queryBuilder->innerJoin(People::class, 'S' , 'WITH', 'S.id = kkk.salesman'); |
|
119 | - $queryBuilder->innerJoin(PeopleClient::class, 'PC' , 'WITH', 'PC.client = myclients.id AND PC.company_id = S.id'); |
|
118 | + $queryBuilder->innerJoin(People::class, 'S', 'WITH', 'S.id = kkk.salesman'); |
|
119 | + $queryBuilder->innerJoin(PeopleClient::class, 'PC', 'WITH', 'PC.client = myclients.id AND PC.company_id = S.id'); |
|
120 | 120 | $queryBuilder->andWhere('O.provider = :provider'); |
121 | 121 | $queryBuilder->andWhere('S.id IN (:my_companies)'); |
122 | 122 | $queryBuilder->andWhere('O.status NOT IN (:statuses)'); |
123 | 123 | $queryBuilder->andWhere('O.orderDate BETWEEN :from_date AND :to_date'); |
124 | - $queryBuilder->setParameter('provider' , $provider); |
|
125 | - $queryBuilder->setParameter('statuses' , $this->getEntityManager()->getRepository(Status::class)->findBy(['realStatus' => ['open','canceled']])); |
|
126 | - $queryBuilder->setParameter('from_date' , $fromDate); |
|
127 | - $queryBuilder->setParameter('to_date' , $toDate); |
|
124 | + $queryBuilder->setParameter('provider', $provider); |
|
125 | + $queryBuilder->setParameter('statuses', $this->getEntityManager()->getRepository(Status::class)->findBy(['realStatus' => ['open', 'canceled']])); |
|
126 | + $queryBuilder->setParameter('from_date', $fromDate); |
|
127 | + $queryBuilder->setParameter('to_date', $toDate); |
|
128 | 128 | $queryBuilder->setParameter('my_companies', $this->getMyCompanies($salesman)); |
129 | 129 | |
130 | 130 | break; |
131 | 131 | |
132 | 132 | case 'inactive': |
133 | 133 | |
134 | - $queryBuilder->innerJoin(Order::class, 'O' , 'WITH', 'O.client = myclients.id'); |
|
135 | - $queryBuilder->innerJoin(People::class, 'C' , 'WITH', 'C.id = O.provider'); |
|
134 | + $queryBuilder->innerJoin(Order::class, 'O', 'WITH', 'O.client = myclients.id'); |
|
135 | + $queryBuilder->innerJoin(People::class, 'C', 'WITH', 'C.id = O.provider'); |
|
136 | 136 | $queryBuilder->innerJoin(PeopleSalesman::class, 'kkk', 'WITH', 'kkk.company = C.id'); |
137 | - $queryBuilder->innerJoin(People::class, 'S' , 'WITH', 'S.id = kkk.salesman'); |
|
138 | - $queryBuilder->innerJoin(PeopleClient::class, 'PC' , 'WITH', 'PC.client = myclients.id AND PC.company_id = S.id'); |
|
139 | - $queryBuilder->leftJoin (Order::class, 'jj' , 'WITH', 'jj.client = myclients.id |
|
137 | + $queryBuilder->innerJoin(People::class, 'S', 'WITH', 'S.id = kkk.salesman'); |
|
138 | + $queryBuilder->innerJoin(PeopleClient::class, 'PC', 'WITH', 'PC.client = myclients.id AND PC.company_id = S.id'); |
|
139 | + $queryBuilder->leftJoin(Order::class, 'jj', 'WITH', 'jj.client = myclients.id |
|
140 | 140 | AND (jj.status NOT IN (:statuses) OR jj.id IS NULL) |
141 | 141 | AND ((jj.orderDate BETWEEN :from_date AND :to_date) OR jj.id IS NULL) |
142 | 142 | AND (jj.provider = :provider OR jj.id IS NULL)'); |
@@ -147,23 +147,23 @@ discard block |
||
147 | 147 | $queryBuilder->groupBy('myclients.id'); |
148 | 148 | $queryBuilder->having('COUNT(jj.id) > :count'); |
149 | 149 | $queryBuilder->andHaving('COUNT(O.id) = :count'); |
150 | - $queryBuilder->setParameter('provider' , $provider); |
|
151 | - $queryBuilder->setParameter('statuses' , $this->getEntityManager()->getRepository(Status::class)->findBy(['realStatus' => ['open','canceled']])); |
|
150 | + $queryBuilder->setParameter('provider', $provider); |
|
151 | + $queryBuilder->setParameter('statuses', $this->getEntityManager()->getRepository(Status::class)->findBy(['realStatus' => ['open', 'canceled']])); |
|
152 | 152 | $queryBuilder->setParameter('from_date', $fromDate); |
153 | - $queryBuilder->setParameter('to_date' , $toDate); |
|
154 | - $queryBuilder->setParameter('count' , 0); |
|
153 | + $queryBuilder->setParameter('to_date', $toDate); |
|
154 | + $queryBuilder->setParameter('count', 0); |
|
155 | 155 | $queryBuilder->setParameter('my_companies', $this->getMyCompanies($salesman)); |
156 | 156 | |
157 | 157 | break; |
158 | 158 | |
159 | 159 | case 'prospect': |
160 | 160 | |
161 | - $queryBuilder->innerJoin(Order::class, 'O' , 'WITH', 'O.client = myclients.id'); |
|
162 | - $queryBuilder->innerJoin(People::class, 'C' , 'WITH', 'C.id = O.provider'); |
|
161 | + $queryBuilder->innerJoin(Order::class, 'O', 'WITH', 'O.client = myclients.id'); |
|
162 | + $queryBuilder->innerJoin(People::class, 'C', 'WITH', 'C.id = O.provider'); |
|
163 | 163 | $queryBuilder->innerJoin(PeopleSalesman::class, 'PS', 'WITH', 'PS.company = C.id'); |
164 | - $queryBuilder->innerJoin(People::class, 'S' , 'WITH', 'S.id = PS.salesman'); |
|
165 | - $queryBuilder->innerJoin(PeopleClient::class, 'PC', 'WITH', 'PC.client = myclients.id AND PC.company_id = S.id'); |
|
166 | - $queryBuilder->leftJoin (Order::class, 'jj' , 'WITH', 'jj.client = myclients.id |
|
164 | + $queryBuilder->innerJoin(People::class, 'S', 'WITH', 'S.id = PS.salesman'); |
|
165 | + $queryBuilder->innerJoin(PeopleClient::class, 'PC', 'WITH', 'PC.client = myclients.id AND PC.company_id = S.id'); |
|
166 | + $queryBuilder->leftJoin(Order::class, 'jj', 'WITH', 'jj.client = myclients.id |
|
167 | 167 | AND (jj.status NOT IN (:statuses) OR jj.id IS NULL) |
168 | 168 | AND (jj.provider = :provider OR jj.id IS NULL)'); |
169 | 169 | $queryBuilder->andWhere('O.provider = :provider'); |
@@ -173,19 +173,19 @@ discard block |
||
173 | 173 | $queryBuilder->having('COUNT(jj.id) = :count'); |
174 | 174 | |
175 | 175 | $queryBuilder->setParameter('provider', $provider); |
176 | - $queryBuilder->setParameter('statuses', $this->getEntityManager()->getRepository(Status::class)->findBy(['realStatus' => ['open','canceled']])); |
|
177 | - $queryBuilder->setParameter('count' , 0); |
|
176 | + $queryBuilder->setParameter('statuses', $this->getEntityManager()->getRepository(Status::class)->findBy(['realStatus' => ['open', 'canceled']])); |
|
177 | + $queryBuilder->setParameter('count', 0); |
|
178 | 178 | $queryBuilder->setParameter('my_companies', $this->getMyCompanies($salesman)); |
179 | 179 | |
180 | 180 | break; |
181 | 181 | |
182 | 182 | case 'new': |
183 | 183 | |
184 | - $queryBuilder->innerJoin(Order::class, 'O' , 'WITH', 'O.client = myclients.id'); |
|
185 | - $queryBuilder->innerJoin(People::class, 'C' , 'WITH', 'C.id = O.provider'); |
|
184 | + $queryBuilder->innerJoin(Order::class, 'O', 'WITH', 'O.client = myclients.id'); |
|
185 | + $queryBuilder->innerJoin(People::class, 'C', 'WITH', 'C.id = O.provider'); |
|
186 | 186 | $queryBuilder->innerJoin(PeopleSalesman::class, 'kkk', 'WITH', 'kkk.company = C.id'); |
187 | - $queryBuilder->innerJoin(People::class, 'S' , 'WITH', 'S.id = kkk.salesman'); |
|
188 | - $queryBuilder->innerJoin(PeopleClient::class, 'PC' , 'WITH', 'PC.client = myclients.id AND PC.company_id = S.id'); |
|
187 | + $queryBuilder->innerJoin(People::class, 'S', 'WITH', 'S.id = kkk.salesman'); |
|
188 | + $queryBuilder->innerJoin(PeopleClient::class, 'PC', 'WITH', 'PC.client = myclients.id AND PC.company_id = S.id'); |
|
189 | 189 | |
190 | 190 | $queryBuilder->andWhere('O.provider = :provider'); |
191 | 191 | $queryBuilder->andWhere('S.id IN (:my_companies)'); |
@@ -193,10 +193,10 @@ discard block |
||
193 | 193 | $queryBuilder->andWhere('O.orderDate BETWEEN :from_date AND :to_date'); |
194 | 194 | $queryBuilder->andWhere('myclients.registerDate BETWEEN :from_date AND :to_date'); |
195 | 195 | |
196 | - $queryBuilder->setParameter('provider' , $provider); |
|
197 | - $queryBuilder->setParameter('statuses' , $this->getEntityManager()->getRepository(Status::class)->findBy(['realStatus' => ['open','canceled']])); |
|
198 | - $queryBuilder->setParameter('from_date' , $fromDate); |
|
199 | - $queryBuilder->setParameter('to_date' , $toDate); |
|
196 | + $queryBuilder->setParameter('provider', $provider); |
|
197 | + $queryBuilder->setParameter('statuses', $this->getEntityManager()->getRepository(Status::class)->findBy(['realStatus' => ['open', 'canceled']])); |
|
198 | + $queryBuilder->setParameter('from_date', $fromDate); |
|
199 | + $queryBuilder->setParameter('to_date', $toDate); |
|
200 | 200 | $queryBuilder->setParameter('my_companies', $this->getMyCompanies($salesman)); |
201 | 201 | |
202 | 202 | break; |