--- dao/DelphiScanner/LabelPrint.pas	2016/05/31 11:50:42	3038
+++ dao/DelphiScanner/LabelPrint.pas	2016/08/15 12:44:21	3086
@@ -6,8 +6,7 @@
   ParentForm,
   PakkeshopLabels,
   Configuration,
-  StBarc,
-  PrtRaw;
+  StBarc;
 
 
 type
@@ -17,9 +16,12 @@
 
     procedure CheckPrintQue(tjektype : string; PrinterNavn : String);
 
+    procedure PrintLabel( Stregkode : String);
+
     procedure SendTilPrinter(kontrolKoreliste, RuteNummer, Kommentar, BoghandlerNavn, Koreliste, SmsKode, DBKbane, Leveringssted : String; var PrintNyLabel : Boolean; BoghandlerNummer : string = '');
 
-    procedure PrintPakkeshopLabel( PakkeshopLabel : TPakkeshopLabel);
+    procedure PrintFuldPakkeLabel( PakkeshopLabel : TPakkeshopLabel);
+
 
     procedure PrintDaodirekteLabel( RuteNummer, Kommentar, BoghandlerNavn : String) ;
 
@@ -49,7 +51,8 @@
   Windows,
   SysUtils, //Format
   Math, // DegToRad() bruges i PrintPakkeshopLabel
-  Forms
+  Forms,
+  IdHTTP
   ;
 
 
@@ -111,6 +114,7 @@
   with Printer do
       begin
         BeginDoc;
+
         Canvas.Font.Size := Config.FontSizeRute;
         if (Length(RuteNummer) > 7) then
         begin
@@ -132,6 +136,11 @@
         Canvas.TextOut(Config.XPosBoghandler, Config.YPosBoghandler, BoghandlerNavn);
         EndDoc;
       end;
+
+
+
+  Printers.SetPrinter( TPrinter.Create() ).Free();//Work around for KB3177725
+
 end;
 
 
@@ -223,9 +232,37 @@
         ClosePrinter(hPrinter);
     end;
   end;
+
+
+  Printers.SetPrinter( TPrinter.Create() ).Free();//Work around for KB3177725
+
 end;
 
 
+procedure TLabelPrint.PrintLabel( Stregkode : String);
+var
+  url: String;
+  response: String;
+
+  httpClient: TIdHTTP;
+
+
+
+begin
+  url := Config.BaseURL + '/BogpakkeKontrol/PrintLabel.php?stregkode=' + Trim(Stregkode);
+
+  httpClient := TIdHTTP.Create();
+  httpClient.ReadTimeout := 1000;//max 1 secound
+  httpClient.ConnectTimeout := 1000;
+
+  response := httpClient.Get(url);
+  httpClient.Free();
+
+
+
+
+end;
+
 procedure TLabelPrint.SendTilPrinter(kontrolKoreliste, RuteNummer, Kommentar, BoghandlerNavn, Koreliste, SmsKode, DBKbane, Leveringssted : String; var PrintNyLabel : Boolean; BoghandlerNummer : string = '');
 begin
     with Printer do
@@ -266,12 +303,16 @@
 
       EndDoc;
     end;
+
+
+    Printers.SetPrinter( TPrinter.Create() ).Free();//Work around for KB3177725
+
 end;
 
 
 
 // ToDo: PrintPakkeshopLabel()
-procedure TLabelPrint.PrintPakkeshopLabel( PakkeshopLabel : TPakkeshopLabel);
+procedure TLabelPrint.PrintFuldPakkeLabel( PakkeshopLabel : TPakkeshopLabel);
 var
   XForm, XFormOld: TXForm; //Bruges til rotate X-formation
   Angle: integer;
@@ -298,15 +339,16 @@
 
 
       // Skriv ikke 'Pakkeshop' overskrift hvis det er en shop2direkte
-      if (  (PakkeshopLabel.Shop2Direkte = '') OR (PakkeshopLabel.Shop2Direkte = '0')  ) then
+      if (  PakkeshopLabel.PakkeshopNavn <> ''  ) then
       begin
         Canvas.TextOut(110, 240, 'Pakkeshop:');
+        Canvas.TextOut(110, 270, PakkeshopLabel.PakkeshopNavn);
+        Canvas.TextOut(110, 300, PakkeshopLabel.PakkeshopAddr);
+        Canvas.TextOut(110, 330, PakkeshopLabel.PakkeshopPostnr);
+
       end;
 
 
-      Canvas.TextOut(110, 270, PakkeshopLabel.PakkeshopNavn);
-      Canvas.TextOut(110, 300, PakkeshopLabel.PakkeshopAddr);
-      Canvas.TextOut(110, 330, PakkeshopLabel.PakkeshopPostnr);
 
       Canvas.TextOut(350, 240, 'Afsender:');
       Canvas.TextOut(350, 270, PakkeshopLabel.AfsenderNavn);
@@ -388,6 +430,8 @@
     end;
 
 
+  Printers.SetPrinter( TPrinter.Create() ).Free();//Work around for KB3177725
+
 end;