@@ -3,22 +3,17 @@ |
||
3 | 3 | namespace OroCRM\Bundle\MagentoBundle\Controller\Api\Rest; |
4 | 4 | |
5 | 5 | use Doctrine\ORM\EntityNotFoundException; |
6 | - |
|
7 | 6 | use Symfony\Component\HttpFoundation\JsonResponse; |
8 | 7 | use Symfony\Component\HttpFoundation\Response; |
9 | - |
|
10 | 8 | use FOS\RestBundle\Controller\Annotations\NamePrefix; |
11 | 9 | use FOS\RestBundle\Routing\ClassResourceInterface; |
12 | 10 | use FOS\RestBundle\Util\Codes; |
13 | - |
|
14 | 11 | use Nelmio\ApiDocBundle\Annotation\ApiDoc; |
15 | - |
|
16 | 12 | use Oro\Bundle\SecurityBundle\Annotation\Acl; |
17 | 13 | use Oro\Bundle\SecurityBundle\Annotation\AclAncestor; |
18 | 14 | use Oro\Bundle\SoapBundle\Controller\Api\Rest\RestController; |
19 | 15 | use Oro\Bundle\AddressBundle\Entity\AddressType; |
20 | 16 | use Oro\Bundle\SecurityBundle\Exception\ForbiddenException; |
21 | - |
|
22 | 17 | use OroCRM\Bundle\MagentoBundle\Entity\Cart; |
23 | 18 | use OroCRM\Bundle\MagentoBundle\Entity\CartAddress; |
24 | 19 |
@@ -3,13 +3,10 @@ |
||
3 | 3 | namespace OroCRM\Bundle\MagentoBundle\Controller\Api\Rest; |
4 | 4 | |
5 | 5 | use Symfony\Component\HttpFoundation\Response; |
6 | - |
|
7 | 6 | use FOS\RestBundle\Controller\Annotations\NamePrefix; |
8 | 7 | use FOS\RestBundle\Controller\Annotations\QueryParam; |
9 | 8 | use FOS\RestBundle\Controller\Annotations\RouteResource; |
10 | - |
|
11 | 9 | use Nelmio\ApiDocBundle\Annotation\ApiDoc; |
12 | - |
|
13 | 10 | use Oro\Bundle\SecurityBundle\Annotation\Acl; |
14 | 11 | use Oro\Bundle\SecurityBundle\Annotation\AclAncestor; |
15 | 12 | use Oro\Bundle\SoapBundle\Controller\Api\Rest\RestController; |
@@ -3,21 +3,16 @@ |
||
3 | 3 | namespace OroCRM\Bundle\MagentoBundle\Controller\Api\Rest; |
4 | 4 | |
5 | 5 | use Doctrine\ORM\EntityNotFoundException; |
6 | - |
|
7 | 6 | use Symfony\Component\HttpFoundation\JsonResponse; |
8 | 7 | use Symfony\Component\HttpFoundation\Response; |
9 | - |
|
10 | 8 | use FOS\RestBundle\Controller\Annotations\NamePrefix; |
11 | 9 | use FOS\RestBundle\Routing\ClassResourceInterface; |
12 | 10 | use FOS\RestBundle\Util\Codes; |
13 | - |
|
14 | 11 | use Nelmio\ApiDocBundle\Annotation\ApiDoc; |
15 | - |
|
16 | 12 | use Oro\Bundle\SecurityBundle\Annotation\Acl; |
17 | 13 | use Oro\Bundle\SecurityBundle\Annotation\AclAncestor; |
18 | 14 | use Oro\Bundle\SoapBundle\Controller\Api\Rest\RestController; |
19 | 15 | use Oro\Bundle\SecurityBundle\Exception\ForbiddenException; |
20 | - |
|
21 | 16 | use OroCRM\Bundle\MagentoBundle\Entity\Cart; |
22 | 17 | use OroCRM\Bundle\MagentoBundle\Entity\Manager\CartApiEntityManager; |
23 | 18 | use OroCRM\Bundle\MagentoBundle\Entity\CartItem; |
@@ -4,21 +4,16 @@ |
||
4 | 4 | |
5 | 5 | use Symfony\Component\HttpFoundation\JsonResponse; |
6 | 6 | use Symfony\Component\HttpFoundation\Response; |
7 | - |
|
8 | 7 | use Doctrine\ORM\EntityNotFoundException; |
9 | - |
|
10 | 8 | use FOS\RestBundle\Controller\Annotations\NamePrefix; |
11 | 9 | use FOS\RestBundle\Routing\ClassResourceInterface; |
12 | 10 | use FOS\RestBundle\Util\Codes; |
13 | - |
|
14 | 11 | use Nelmio\ApiDocBundle\Annotation\ApiDoc; |
15 | - |
|
16 | 12 | use Oro\Bundle\SecurityBundle\Annotation\AclAncestor; |
17 | 13 | use Oro\Bundle\SecurityBundle\Annotation\Acl; |
18 | 14 | use Oro\Bundle\AddressBundle\Entity\AbstractTypedAddress; |
19 | 15 | use Oro\Bundle\SoapBundle\Controller\Api\Rest\RestController; |
20 | 16 | use Oro\Bundle\SecurityBundle\Exception\ForbiddenException; |
21 | - |
|
22 | 17 | use OroCRM\Bundle\MagentoBundle\Entity\Address; |
23 | 18 | use OroCRM\Bundle\MagentoBundle\Entity\Customer; |
24 | 19 | use OroCRM\Bundle\MagentoBundle\Entity\Manager\CustomerApiEntityManager; |
@@ -3,14 +3,11 @@ |
||
3 | 3 | namespace OroCRM\Bundle\MagentoBundle\Controller\Api\Rest; |
4 | 4 | |
5 | 5 | use Symfony\Component\HttpFoundation\Response; |
6 | - |
|
7 | 6 | use FOS\RestBundle\Controller\Annotations\NamePrefix; |
8 | 7 | use FOS\RestBundle\Controller\Annotations\QueryParam; |
9 | 8 | use FOS\RestBundle\Routing\ClassResourceInterface; |
10 | 9 | use FOS\RestBundle\Controller\Annotations\RouteResource; |
11 | - |
|
12 | 10 | use Nelmio\ApiDocBundle\Annotation\ApiDoc; |
13 | - |
|
14 | 11 | use Oro\Bundle\SecurityBundle\Annotation\Acl; |
15 | 12 | use Oro\Bundle\SecurityBundle\Annotation\AclAncestor; |
16 | 13 | use Oro\Bundle\SoapBundle\Controller\Api\Rest\RestController; |
@@ -3,21 +3,16 @@ |
||
3 | 3 | namespace OroCRM\Bundle\MagentoBundle\Controller\Api\Rest; |
4 | 4 | |
5 | 5 | use Doctrine\ORM\EntityNotFoundException; |
6 | - |
|
7 | 6 | use Symfony\Component\HttpFoundation\JsonResponse; |
8 | 7 | use Symfony\Component\HttpFoundation\Response; |
9 | - |
|
10 | 8 | use FOS\RestBundle\Controller\Annotations\NamePrefix; |
11 | 9 | use FOS\RestBundle\Routing\ClassResourceInterface; |
12 | 10 | use FOS\RestBundle\Util\Codes; |
13 | - |
|
14 | 11 | use Nelmio\ApiDocBundle\Annotation\ApiDoc; |
15 | - |
|
16 | 12 | use Oro\Bundle\SecurityBundle\Annotation\Acl; |
17 | 13 | use Oro\Bundle\SecurityBundle\Annotation\AclAncestor; |
18 | 14 | use Oro\Bundle\SoapBundle\Controller\Api\Rest\RestController; |
19 | 15 | use Oro\Bundle\SecurityBundle\Exception\ForbiddenException; |
20 | - |
|
21 | 16 | use OroCRM\Bundle\MagentoBundle\Entity\Order; |
22 | 17 | use OroCRM\Bundle\MagentoBundle\Entity\Manager\OrderApiEntityManager; |
23 | 18 | use OroCRM\Bundle\MagentoBundle\Entity\OrderAddress; |
@@ -3,21 +3,16 @@ |
||
3 | 3 | namespace OroCRM\Bundle\MagentoBundle\Controller\Api\Rest; |
4 | 4 | |
5 | 5 | use Doctrine\ORM\EntityNotFoundException; |
6 | - |
|
7 | 6 | use Symfony\Component\HttpFoundation\JsonResponse; |
8 | 7 | use Symfony\Component\HttpFoundation\Response; |
9 | - |
|
10 | 8 | use FOS\RestBundle\Controller\Annotations\NamePrefix; |
11 | 9 | use FOS\RestBundle\Routing\ClassResourceInterface; |
12 | 10 | use FOS\RestBundle\Util\Codes; |
13 | - |
|
14 | 11 | use Nelmio\ApiDocBundle\Annotation\ApiDoc; |
15 | - |
|
16 | 12 | use Oro\Bundle\SecurityBundle\Annotation\Acl; |
17 | 13 | use Oro\Bundle\SecurityBundle\Annotation\AclAncestor; |
18 | 14 | use Oro\Bundle\SoapBundle\Controller\Api\Rest\RestController; |
19 | 15 | use Oro\Bundle\SecurityBundle\Exception\ForbiddenException; |
20 | - |
|
21 | 16 | use OroCRM\Bundle\MagentoBundle\Entity\Order; |
22 | 17 | use OroCRM\Bundle\MagentoBundle\Entity\Manager\OrderApiEntityManager; |
23 | 18 | use OroCRM\Bundle\MagentoBundle\Entity\OrderItem; |
@@ -4,13 +4,10 @@ |
||
4 | 4 | |
5 | 5 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
6 | 6 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; |
7 | - |
|
8 | 7 | use Symfony\Component\HttpFoundation\JsonResponse; |
9 | 8 | use Symfony\Bundle\FrameworkBundle\Controller\Controller; |
10 | - |
|
11 | 9 | use Oro\Bundle\SecurityBundle\Annotation\Acl; |
12 | 10 | use Oro\Bundle\SecurityBundle\Annotation\AclAncestor; |
13 | - |
|
14 | 11 | use OroCRM\Bundle\MagentoBundle\Entity\Customer; |
15 | 12 | use OroCRM\Bundle\MagentoBundle\Entity\NewsletterSubscriber; |
16 | 13 |
@@ -5,14 +5,12 @@ |
||
5 | 5 | use Doctrine\Common\Collections\ArrayCollection; |
6 | 6 | use Doctrine\Common\Collections\Collection; |
7 | 7 | use Doctrine\ORM\Mapping as ORM; |
8 | - |
|
9 | 8 | use Oro\Bundle\AddressBundle\Entity\AbstractAddress; |
10 | 9 | use Oro\Bundle\DataAuditBundle\Metadata\Annotation as Oro; |
11 | 10 | use Oro\Bundle\EntityConfigBundle\Metadata\Annotation\Config; |
12 | 11 | use Oro\Bundle\EntityConfigBundle\Metadata\Annotation\ConfigField; |
13 | 12 | use Oro\Bundle\OrganizationBundle\Entity\Organization; |
14 | 13 | use Oro\Bundle\UserBundle\Entity\User; |
15 | - |
|
16 | 14 | use OroCRM\Bundle\AccountBundle\Entity\Account; |
17 | 15 | use OroCRM\Bundle\AnalyticsBundle\Model\RFMAwareInterface; |
18 | 16 | use OroCRM\Bundle\AnalyticsBundle\Model\RFMAwareTrait; |
@@ -661,7 +661,7 @@ discard block |
||
661 | 661 | } |
662 | 662 | |
663 | 663 | /** |
664 | - * @return string |
|
664 | + * @return double |
|
665 | 665 | */ |
666 | 666 | public function getVat() |
667 | 667 | { |
@@ -715,7 +715,7 @@ discard block |
||
715 | 715 | /** |
716 | 716 | * @param int $originId |
717 | 717 | * |
718 | - * @return Address|false |
|
718 | + * @return boolean |
|
719 | 719 | */ |
720 | 720 | public function getAddressByOriginId($originId) |
721 | 721 | { |