Merge pull request #25 from AlexandreBellas/develop

feat: atualizar para v310
AlexandreBellas · Oct 5, 2024 · 887905b · 887905b
2 parents 2d8fce7 + af2e48f
commit 887905b
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 25 deletions.
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@
 Pacote de integração com a [API v3 do ERP Bling](https://developer.bling.com.br)
 para PHP 8.2+. O mais completo existente.
 
-Atualizado com a versão `v308` da API ([veja o registro de alterações](https://developer.bling.com.br/changelogs#2024-09-04)).
+Atualizado com a versão `v310` da API ([veja o registro de alterações](https://developer.bling.com.br/changelogs#2024-10-02)).
 
 ## Instalação
 

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
   "name": "alebatistella/bling-erp-api",
   "description": "Pacote de integração com a API do Bling ERP",
   "type": "library",
-  "version": "1.16.0",
+  "version": "1.17.0",
   "license": "MIT",
   "autoload": {
     "psr-4": {

diff --git a/src/Entities/Contatos/Schema/Get/GetParams.php b/src/Entities/Contatos/Schema/Get/GetParams.php
@@ -52,10 +52,10 @@ public function __construct(
     ) {
         $this->criterio = $criterio instanceof Criterio ? $criterio->value : $criterio;
 
-        $this->dataInclusaoInicial = $this->prepareStringOrDateParam($dataInclusaoInicial);
-        $this->dataInclusaoFinal = $this->prepareStringOrDateParam($dataInclusaoFinal);
-        $this->dataAlteracaoInicial = $this->prepareStringOrDateParam($dataAlteracaoInicial);
-        $this->dataAlteracaoFinal = $this->prepareStringOrDateParam($dataAlteracaoFinal);
+        $this->dataInclusaoInicial = $this->prepareStringOrDateParam($dataInclusaoInicial, true);
+        $this->dataInclusaoFinal = $this->prepareStringOrDateParam($dataInclusaoFinal, true);
+        $this->dataAlteracaoInicial = $this->prepareStringOrDateParam($dataAlteracaoInicial, true);
+        $this->dataAlteracaoFinal = $this->prepareStringOrDateParam($dataAlteracaoFinal, true);
 
         $this->uf = $uf instanceof UF ? $uf->value : $uf;
 

diff --git a/src/Entities/Nfses/Nfses.php b/src/Entities/Nfses/Nfses.php
@@ -9,13 +9,7 @@
 use AleBatistella\BlingErpApi\Entities\Nfses\Schema\Find\FindResponse;
 use AleBatistella\BlingErpApi\Entities\Nfses\Schema\Get\GetResponse;
 use AleBatistella\BlingErpApi\Entities\Nfses\Schema\GetConfigurations\GetConfigurationsResponse;
-use AleBatistella\BlingErpApi\Entities\Nfses\Schema\PostAccounts\PostAccountsResponse;
-use AleBatistella\BlingErpApi\Entities\Nfses\Schema\PostStock\PostStockResponse;
-use AleBatistella\BlingErpApi\Entities\Nfses\Schema\PostStockToDeposit\PostStockToDepositResponse;
-use AleBatistella\BlingErpApi\Entities\Nfses\Schema\ReverseAccounts\ReverseAccountsResponse;
-use AleBatistella\BlingErpApi\Entities\Nfses\Schema\ReverseStock\ReverseStockResponse;
 use AleBatistella\BlingErpApi\Entities\Nfses\Schema\Send\SendResponse;
-use AleBatistella\BlingErpApi\Entities\Nfses\Schema\Update\UpdateResponse;
 use AleBatistella\BlingErpApi\Entities\Nfses\Schema\UpdateConfigurations\UpdateConfigurationsResponse;
 use AleBatistella\BlingErpApi\Entities\Shared\BaseEntity;
 use AleBatistella\BlingErpApi\Entities\Shared\DTO\Request\RequestOptions;
@@ -159,17 +153,19 @@ public function send(int $idNotaServico): SendResponse
      * Cancela uma nota de serviço.
      *
      * @param int $idNotaServico ID da nota de serviço
+     * @param array $body Corpo da requisição
      *
      * @return null
      * @throws BlingApiException|BlingInternalException
      *
      * @see https://developer.bling.com.br/referencia#/Notas%20Fiscais%20de%20Servi%C3%A7o%20Eletr%C3%B4nicas/post_nfse__idNotaServico__cancelar
      */
-    public function cancel(int $idNotaServico): null
+    public function cancel(int $idNotaServico, array $body): null
     {
         $response = $this->repository->store(
             new RequestOptions(
                 endpoint: "nfse/$idNotaServico/cancelar",
+                body: $body
             )
         );
 

diff --git a/src/Entities/Nfses/__tests__/NfsesTest.spec.php b/src/Entities/Nfses/__tests__/NfsesTest.spec.php
@@ -47,7 +47,7 @@ public function testShouldDeleteSuccessfully(): void
             ->method('destroy')
             ->with(
                 $this->callback(
-                    fn (RequestOptions $requestOptions) =>
+                    fn(RequestOptions $requestOptions) =>
                     $requestOptions->endpoint === "nfse/$idNotaServico"
                 )
             )
@@ -72,7 +72,7 @@ public function testShouldGetSuccessfully(): void
             ->method('index')
             ->with(
                 $this->callback(
-                    fn (RequestOptions $requestOptions) =>
+                    fn(RequestOptions $requestOptions) =>
                     $requestOptions->endpoint === "nfse"
                         && is_null($requestOptions->queryParams)
                 )
@@ -100,7 +100,7 @@ public function testShouldFindSuccessfully(): void
             ->method('show')
             ->with(
                 $this->callback(
-                    fn (RequestOptions $requestOptions) =>
+                    fn(RequestOptions $requestOptions) =>
                     $requestOptions->endpoint === "nfse/$idNotaServico"
                 )
             )
@@ -129,7 +129,7 @@ public function testShouldGetConfigurationsSuccessfully(): void
             ->method('index')
             ->with(
                 $this->callback(
-                    fn (RequestOptions $requestOptions) =>
+                    fn(RequestOptions $requestOptions) =>
                     $requestOptions->endpoint === "nfse/configurations"
                 )
             )
@@ -156,7 +156,7 @@ public function testShouldCreateSuccessfully(): void
             ->method('store')
             ->with(
                 $this->callback(
-                    fn (RequestOptions $requestOptions) =>
+                    fn(RequestOptions $requestOptions) =>
                     $requestOptions->endpoint === "nfse"
                 )
             )
@@ -183,7 +183,7 @@ public function testShouldSendSuccessfully(): void
             ->method('store')
             ->with(
                 $this->callback(
-                    fn (RequestOptions $requestOptions) =>
+                    fn(RequestOptions $requestOptions) =>
                     $requestOptions->endpoint === "nfse/$idNotaServico/enviar"
                 )
             )
@@ -204,20 +204,24 @@ public function testShouldSendSuccessfully(): void
     public function testShouldCancelSuccessfully(): void
     {
         $idNotaServico = fake()->randomNumber();
+        $cancelRequest = json_decode(file_get_contents(__DIR__ . '/cancel/request.json'), true);
         $cancelResponse = json_decode(file_get_contents(__DIR__ . '/cancel/response.json'), true);
         $repository = $this->getMockBuilder(IBlingRepository::class)->getMock();
         $repository->expects($this->once())
             ->method('store')
             ->with(
                 $this->callback(
-                    fn (RequestOptions $requestOptions) =>
+                    fn(RequestOptions $requestOptions) =>
                     $requestOptions->endpoint === "nfse/$idNotaServico/cancelar"
                 )
             )
             ->willReturn($this->buildResponse(status: 200, body: $this->buildBody($cancelResponse)));
 
         /** @var IBlingRepository $repository */
-        $response = $this->getInstance($repository)->cancel($idNotaServico);
+        $response = $this->getInstance($repository)->cancel(
+            $idNotaServico,
+            $cancelRequest
+        );
 
         $this->assertNull($response);
     }
@@ -242,7 +246,7 @@ public function testShouldUpdateConfigurationsSuccessfully(): void
             ->method('replace')
             ->with(
                 $this->callback(
-                    fn (RequestOptions $requestOptions) =>
+                    fn(RequestOptions $requestOptions) =>
                     $requestOptions->endpoint === "nfse/configuracoes"
                 )
             )

diff --git a/src/Entities/Nfses/__tests__/cancel/request.json b/src/Entities/Nfses/__tests__/cancel/request.json
@@ -0,0 +1,4 @@
+{
+    "codigoMotivo": 1,
+    "justificativa": "Cancelamento de NFS-e"
+}
diff --git a/src/Entities/PedidosVendas/Schema/Get/GetParams.php b/src/Entities/PedidosVendas/Schema/Get/GetParams.php
@@ -55,16 +55,16 @@ public function __construct(
         public ?array $numerosLojas = null,
     ) {
         $this->situacoes = array_map(
-            fn (Situacao|int|null $situacao) => $situacao instanceof Situacao
+            fn(Situacao|int|null $situacao) => $situacao instanceof Situacao
                 ? $situacao->value
                 : $situacao,
             $situacoes
         );
 
         $this->dataInicial = $this->prepareStringOrDateParam($dataInicial);
         $this->dataFinal = $this->prepareStringOrDateParam($dataFinal);
-        $this->dataAlteracaoInicial = $this->prepareStringOrDateParam($dataAlteracaoInicial);
-        $this->dataAlteracaoFinal = $this->prepareStringOrDateParam($dataAlteracaoFinal);
+        $this->dataAlteracaoInicial = $this->prepareStringOrDateParam($dataAlteracaoInicial, true);
+        $this->dataAlteracaoFinal = $this->prepareStringOrDateParam($dataAlteracaoFinal, true);
         $this->dataPrevistaInicial = $this->prepareStringOrDateParam($dataPrevistaInicial);
         $this->dataPrevistaFinal = $this->prepareStringOrDateParam($dataPrevistaFinal);