Merge pull request #10 from lunasoft/feature/ss-391

ReyesSW · web-flow · commit b5d3f41a1f76 · 2023-10-16T16:07:50.000-06:00
Merge a Develop con cambios para timbrado Json, por detalle de Form.
diff --git a/Issue/JsonIssue/IssueJsonRequest.pas b/Issue/JsonIssue/IssueJsonRequest.pas
@@ -25,45 +25,55 @@ interface
 implementation
 
 function IssueServiceJSON(URL, Token, Json, Version: String): String;
- var
+var
   HTTP: TIdHTTP;
   RequestBody: TStream;
+  IsUTF8: Boolean;
 begin
-try
-     HTTP := TIdHTTP.Create;
-finally
-
-end;
+  try
+    HTTP := TIdHTTP.Create;
+  finally
+  end;
 
-try
-   try
-       RequestBody := TStringStream.Create(UTF8ToWideString(Json), TEncoding.UTF8);
-     try
-        HTTP.Request.Accept := 'application/json';
-        HTTP.Request.ContentType := 'application/jsontoxml';
-        HTTP.Request.CustomHeaders.FoldLines := False;
-        HTTP.Request.CustomHeaders.Add('Authorization:Bearer ' + Token);
+  try
+    try
+      IsUTF8 := TEncoding.UTF8.GetString(TEncoding.UTF8.GetBytes(Json)) = Json;
 
-        URL := URL+'/v3/cfdi33/issue/json/'+Version;
-        Result := HTTP.Post(URL,RequestBody);
-        HTTP.responseCode;
-      finally
-        RequestBody.Free;
-      end;
-    except
-      on E: EIdHTTPProtocolException do
+      if not IsUTF8 then
       begin
-       Result := E.ErrorMessage;
-      end;
-      on E: Exception do
+        RequestBody := TStringStream.Create(UTF8ToWideString(Json), TEncoding.UTF8);
+      end
+      else
       begin
-       Result := E.Message;
+        RequestBody := TStringStream.Create(Json, TEncoding.UTF8);
       end;
+
+      HTTP.Request.Accept := 'application/json';
+      HTTP.Request.ContentType := 'application/jsontoxml';
+      HTTP.Request.CustomHeaders.FoldLines := False;
+      HTTP.Request.CustomHeaders.Add('Authorization:Bearer ' + Token);
+
+      URL := URL+'/v3/cfdi33/issue/json/'+Version;
+      Result := HTTP.Post(URL, RequestBody);
+      HTTP.responseCode;
+    finally
+      RequestBody.Free;
+    end;
+  except
+    on E: EIdHTTPProtocolException do
+    begin
+      Result := E.ErrorMessage;
+    end;
+    on E: Exception do
+    begin
+      Result := E.Message;
     end;
-  finally
-    HTTP.Free;
   end;
+
+  HTTP.Free;
   ReportMemoryLeaksOnShutdown := False;
 end;
 
-end.
+
+
+end.
diff --git a/TestServices.pas b/TestServices.pas
@@ -42,7 +42,7 @@ function fechaDeVencimiento(expiresIn: String): String;
 
 type
 	TForm1 = class(TForm)
-		Autenticaci�n: TPageControl;
+		Autenticación: TPageControl;
 		TabSheet1: TTabSheet;
 		TabSheet2: TTabSheet;
 		TabSheet3: TTabSheet;
@@ -60,7 +60,7 @@ 	TForm1 = class(TForm)
 		txtURL: TEdit;
 		Label1: TLabel;
 		txtToken: TEdit;
-		Expiraci�n: TLabel;
+		Expiración: TLabel;
 		txtCaducidad: TEdit;
 		Label2: TLabel;
 		txtTokenTipo: TEdit;
@@ -218,7 +218,7 @@ 	TForm1 = class(TForm)
 		Label61: TLabel;
 		Label62: TLabel;
 		Label63: TLabel;
-		Cancelaci�n: TPageControl;
+		Cancelación: TPageControl;
 		TabSheet14: TTabSheet;
 		TabSheet15: TTabSheet;
 		TabSheet17: TTabSheet;
@@ -431,6 +431,7 @@ 	TForm1 = class(TForm)
 		procedure Button20Click(Sender: TObject);
 		procedure Button21Click(Sender: TObject);
 		procedure Button10Click(Sender: TObject);
+    procedure memoJsonChange(Sender: TObject);
 	private
 		{ Private declarations }
 	public
@@ -624,19 +625,21 @@ procedure TForm1.Button15Click(Sender: TObject);
 end;
 
 procedure TForm1.Button16Click(Sender: TObject);
-var
-	stream: TMemoryStream;
 begin
-	memoJson.Text := '';
-	OpenDialog1.Filter := 'Archivos JSON (*.json)|*.json|';
-	stream := TMemoryStream.Create;
-
-	if OpenDialog1.Execute then
-		if FileExists(OpenDialog1.FileName) then
-			stream.LoadFromFile(OpenDialog1.FileName)
-		else
-			raise Exception.Create('File does not exist.');
-	memoJson.Lines.LoadFromFile(OpenDialog1.FileName);
+  memoJson.Text := ''; // Borra cualquier contenido previo en el TMemo
+  OpenDialog1.Filter := 'Archivos JSON (*.json)|*.json|';
+
+  if OpenDialog1.Execute then
+  begin
+    if FileExists(OpenDialog1.FileName) then
+    begin
+      memoJson.Lines.LoadFromFile(OpenDialog1.FileName, TEncoding.UTF8); // Carga el archivo utilizando UTF-8
+    end
+    else
+    begin
+      raise Exception.Create('File does not exist.');
+    end;
+  end;
 end;
 
 procedure TForm1.Button17Click(Sender: TObject);
@@ -1361,6 +1364,16 @@ procedure TForm1.cleanStamp();
 	txtMessageStamp.Text := '';
 	txtMessageDetailStamp.Text := '';
 end;
+procedure TForm1.memoJsonChange(Sender: TObject);
+var
+  TextToProcess: string;
+begin
+  TextToProcess := memoJson.Text;
+
+  TextToProcess := UTF8Encode(TextToProcess);
+
+  memoJson.Text := TextToProcess;
+end;
 
 procedure TForm1.cleanIssueStamp();
 begin
@@ -1394,4 +1407,4 @@ procedure TForm1.cleanJsonStamp();
 	txtJsonMessageDetail.Text := '';
 end;
 
-end.
+end.
