--- dao/DelphiScanner/Main.pas	2015/08/23 16:17:56	2664
+++ dao/DelphiScanner/Main.pas	2015/08/25 16:34:41	2668
@@ -9,7 +9,8 @@
   Menus, ExtCtrls, ComCtrls, StrUtils, MMSystem, DateUtils,
   IdExplicitTLSClientServerBase, IdFTP, pngimage, GIFImg, IdException,
   Winspool, Registry, ShellApi, ClipBrd, Buttons, wininet,
-  UITypes
+  UITypes,
+  PakkeshopLabels
 
   ;
 
@@ -58,7 +59,7 @@
     DownloadButton03: TButton;
     Pakkeshoplevering1: TMenuItem;
     PakkeshopText1: TStaticText;
-    PakkeshopNulstil: TButton;
+    btnNulstil: TButton;
     Returpakkerfrapakkeshop1: TMenuItem;
     Altidprintepakkelabel1: TMenuItem;
     chkAltidPrintLabel: TCheckBox;
@@ -147,7 +148,7 @@
   procedure UploadButton01Click(Sender: TObject);
   procedure DownloadButton03Click(Sender: TObject);
   procedure Pakkeshoplevering1Click(Sender: TObject);
-  procedure PakkeshopNulstilClick(Sender: TObject);
+  procedure btnNulstilClick(Sender: TObject);
   procedure Returpakkerfrapakkeshop1Click(Sender: TObject);
   procedure InitNatxpresslevering();
   procedure InitReturFraDao();
@@ -162,7 +163,6 @@
   procedure EKLoverforselClick(Sender: TObject);
   procedure Uploadlogfil1Click(Sender: TObject);
   procedure Manual1Click(Sender: TObject);
-  procedure CheckPrintQue(tjektype : string);
   procedure Timer1Timer(Sender: TObject);
   procedure Scanogstjekkoden1Click(Sender: TObject);
   procedure chkScanTjekkodeClick(Sender: TObject);
@@ -182,12 +182,13 @@
   procedure SletLogfiler(Path: string; FileList: TStrings);
   procedure Manualgenerel1Click(Sender: TObject);
   procedure TjekkerUrls();
-// 20150310: start
+
   procedure RoundCornerOf(Control: TWinControl);
-    procedure menuIndleveringClick(Sender: TObject);
+  procedure menuIndleveringClick(Sender: TObject);
 
+  procedure PrintPakkeshopLabel( PakkeshopLabel : TPakkeshopLabel);
+  procedure CheckPrintQue(tjektype : string);
 
-// 20150310: slut
 
   private
     SpecialVersionSted, SpecialVersionScanningtype: String;    // Bruges når programmet skal bruges udenfor DAO scanningssteder
@@ -195,7 +196,7 @@
     SkrivLog : String;
     Sted : String;
     StedNavn : String;
-    Url, UrlNormal, UrlReturDAO, UrlReturBoghandler, UrlBudlevering, UrlManglendeScanninger, UrlPakkeshoplevering, UrlReturPakkeshop, UrlPakkeshopManglendeScanninger, UrlPakkeshopManglendeReturScanninger,UrlEKLoverforsel : String;
+    Url, UrlNormal, UrlReturDAO, UrlReturBoghandler, UrlBudlevering, UrlManglendeScanninger, UrlPakkeshoplevering, UrlReturPakkeshop, UrlPakkeshopManglendeScanninger, UrlPakkeshopManglendeReturScanninger,UrlIndleveringsPakke,UrlEKLoverforsel : String;
 // 29150330: start
     UrlEKLoverforselPakkeshop : String;
 // 20150330: slut
@@ -250,6 +251,8 @@
     BoghandlerStregkode, BoghandlerTjekkode : String;
     TjekUrls : String;
 
+    PakkeshopLabel: TPakkeshopLabel;
+
 	  function CheckSumModulo10(const data:string):string;   	{ used for EAN 8/13 }
 
     procedure PrintLabel(RuteNummer, Kommentar, BoghandlerNavn, Koreliste, SmsKode, DBKbane, Leveringssted : String; var PrintNyLabel : Boolean; BoghandlerNummer : String = '');
@@ -548,7 +551,7 @@
   PrinterstatusStaticText1.Caption := '';
   PrinterstatusStaticText1.Color := MainForm.Color;
 
-  PakkeshopNulstil.BringToFront;
+  btnNulstil.BringToFront;
 
   RoundCornerOf(PanelManglendePakker1);
   RoundCornerOf(PanelManglendePakker2);
@@ -590,6 +593,10 @@
     UrlReturPakkeshop := ReadString('Settings','UrlReturPakkeshop','http://omdeling.info/webservices/pakkeshop/returpakkekontrol.php?sted=%s&stregkode=%s');
     UrlPakkeshopManglendeScanninger := ReadString('Settings','UrlPakkeshopManglendeScanninger','http://omdeling.info/webservices/pakkeshop/pakkemanglendescanninger.php?sted=%s');
     UrlPakkeshopManglendeReturScanninger := ReadString('Settings','UrlPakkeshopManglendeReturScanninger','http://omdeling.info/webservices/pakkeshop/pakkemanglendereturscanninger.php?sted=%s');
+
+    UrlIndleveringsPakke := ReadString('Settings','UrlIndleveringsPakke','http://omdeling.info/webservices/pakkeshop/PakkekontrolIndleveringskode.php?sted=%s&pakkekode=%s');
+
+
     LabelType := ReadInteger('Settings','LabelType',1);
     FarveNormal := ReadString('Settings','FarveNormal','D8D8D8');
     TitelNormal := ReadString('Settings','TitelNormal','Modtagelse af DAO NAT X-PRESS pakker');
@@ -836,6 +843,9 @@
       PanelValg5.Font.Color := clInactiveCaption;
       PanelValg6.Enabled := false;
       PanelValg6.Font.Color := clInactiveCaption;
+      PanelValg7.Enabled := false;
+      PanelValg7.Font.Color := clInactiveCaption;
+
      // her skal vi også disable de menupunkter DBK ikke kan bruge
       ReturpakkerfraDAO1.Enabled := false;
       Returpakkerfraboghandler1.Enabled := false;
@@ -872,6 +882,8 @@
       PanelValg5.Font.Color := clInactiveCaption;
       PanelValg6.Enabled := false;
       PanelValg6.Font.Color := clInactiveCaption;
+      PanelValg7.Enabled := false;
+      PanelValg7.Font.Color := clInactiveCaption;
      // her skal vi også disable de menupunkter Bladhusene (01, 02, 03 og 04) ikke kan bruge
 
       Automatiskvalg1.Enabled := false;
@@ -967,7 +979,7 @@
            RutenummerST.Caption := '';
            BoghandlerNavnST.Caption := 'Fejl i urls';
            KommentarST.Caption := 'Se log vinduet';
-           PakkeshopNulstil.Visible := true;
+           btnNulstil.Visible := true;
            exit;
         end;
     end
@@ -1216,11 +1228,11 @@
 
     if StregKode = 'Nulstil' then
     begin
-       PakkeshopNulstil.Click();
+       btnNulstil.Click();
        exit;
     end;
 
-    if PakkeshopNulstil.Visible then
+    if btnNulstil.Visible then
     begin
       VisAlarmSkaerm( 'HUSK at klikke Nulstil før ny scanning...' );
 
@@ -1545,7 +1557,7 @@
            BoghandlerStregkode := Stregkode;
            BoghandlerTjekkode := '';
            PakkeshopText1.Caption := 'Stregkode';
-           PakkeshopNulstil.Visible := false;
+           btnNulstil.Visible := false;
            Stregkode := '';
            InitScreen();
       end
@@ -1557,7 +1569,7 @@
            BoghandlerStregkode := Stregkode;
            BoghandlerTjekkode := '-1';
            PakkeshopText1.Caption := 'Stregkode';
-           PakkeshopNulstil.Visible := false;
+           btnNulstil.Visible := false;
            Stregkode := '';
            InitScreen();
       end
@@ -1591,7 +1603,7 @@
               MainForm.Color := HexToTColor(FarvePakkeshoplevering);
            if (Pakkernormal1.Checked) then
               MainForm.Color := HexToTColor(FarveNormal);
-           PakkeshopNulstil.Visible := false;
+           btnNulstil.Visible := false;
          end
         else
          begin
@@ -1644,7 +1656,7 @@
             if (pakkeErScannet > 0) or (pakkeForkertSted > 0) or (tjekkodemangler > 0) then
             begin
               PlaySound(PWideChar(AlarmLyd));
-              PakkeshopNulstil.Visible := true;
+              btnNulstil.Visible := true;
               MainForm.Color := clRed;
             end;
          end;
@@ -1659,7 +1671,7 @@
             begin
               PlaySound(PWideChar(ScannetOkLyd));
             end;
-            PakkeshopNulstil.Visible := false;
+            btnNulstil.Visible := false;
           end
           else if (Returpakkerfradao1.Checked or Returpakkerfraboghandler1.Checked) then
           begin
@@ -1672,7 +1684,7 @@
             begin
               PlaySound(PWideChar(ScannetOkLyd));
             end;
-            PakkeshopNulstil.Visible := false;
+            btnNulstil.Visible := false;
           end
           else if Copy(Kommentar,1,8) = 'OPRETTET' then
           begin
@@ -1685,7 +1697,7 @@
           begin
             VisAlarmSkaerm('');
           end;
-         if not PakkeshopNulstil.Visible then
+         if not btnNulstil.Visible then
           begin
 
             If (Budlevering1.Checked) then
@@ -2065,6 +2077,8 @@
   begin
     pakkestorrelse := 'Lille';
   end;
+
+
   if Pakkernormal1.Checked then
   begin
      if (BoghandlerTjekkode = '') then
@@ -2093,6 +2107,10 @@
   begin
      URLStr := Format(UrlReturPakkeshop,[Sted, PakkeNr]);
   end
+  else if menuIndlevering.Checked then
+  begin
+    URLStr := Format(UrlIndleveringsPakke,[Sted, PakkeNr]);
+  end
   else
   begin
     exit;
@@ -2139,10 +2157,26 @@
         begin
           PrintNyLabel := True;
         end;
-// 20150310: start
       end;
-// 20150310: slut
      end
+    else if menuIndlevering.Checked then
+    begin
+
+
+
+
+     Kommentar := XMLDocument1.ChildNodes.FindNode('PakkeKontrol').ChildNodes.FindNode('Stregkodematch').Text;
+     if (Kommentar = 'Ok') then
+     begin
+       PrintNyLabel := True; //Indleveringskode vil ALTID udskrive label
+       PakkeshopLabel := TPakkeshopLabel.Create( XMLDocument1 ); //Opret struct og parse xml doc
+
+       PrintPakkeshopLabel( PakkeshopLabel );
+
+     end;
+
+
+    end
     else
      begin
       RuteNummer := XMLDocument1.ChildNodes.FindNode('BogpakkeKontrol').ChildNodes.FindNode('TurId').Text;
@@ -2175,6 +2209,8 @@
         PrintNyLabel := True;
       end;
     end;
+
+
     if (BladhusSted > 00) and (BladhusSted < Length(BladhusStedNavn)) then
     begin
       if (Leveringssted <> BladhusStedKode[BladhusSted]) and (BladhusStedKode[BladhusSted] <> 'DBK') then
@@ -2334,7 +2370,7 @@
 
         PlaySound(PWideChar(AlarmLyd));
         MainForm.Color := clRed;
-        PakkeshopNulstil.Visible := true;
+        btnNulstil.Visible := true;
 
      end
      else
@@ -2361,7 +2397,7 @@
           begin
             PlaySound(PWideChar(AlarmLyd));
             MainForm.Color := clRed;
-            PakkeshopNulstil.Visible := true;
+            btnNulstil.Visible := true;
           end;
 
        end;
@@ -2387,7 +2423,7 @@
           begin
             PlaySound(PWideChar(AlarmLyd));
             MainForm.Color := clRed;
-            PakkeshopNulstil.Visible := true;
+            btnNulstil.Visible := true;
           end;
 
        end;
@@ -3073,11 +3109,11 @@
   end;
 end;
 
-procedure TMainForm.PakkeshopNulstilClick(Sender: TObject);
+procedure TMainForm.btnNulstilClick(Sender: TObject);
 begin
   PakkeshopStregkode := '';
   PakkeshopTjekkode := '';
-  PakkeshopNulstil.Visible := false;
+  btnNulstil.Visible := false;
   PakkeshopText1.Caption := 'Stregkode';
   BoghandlerStregkode := '';
   BoghandlerTjekkode := '';
@@ -3227,7 +3263,7 @@
     // Her kommer en alarm og rød skærm
     PlaySound(PWideChar(AlarmLyd));
     MainForm.Color := clRed;
-    PakkeshopNulstil.Visible := true;
+    btnNulstil.Visible := true;
   end
   else
   begin
@@ -3507,7 +3543,7 @@
 procedure TMainForm.InitNatxpresslevering();
 begin
       AutomatiskTjekkodeStyring1.Enabled := true;
-      PakkeshopNulstil.Visible := false;
+      btnNulstil.Visible := false;
       Pakkernormal1.Checked := true;
       InitForm(FarveNormal,TitelNormal,UrlNormal);
       PanelValg1.Color := clGreen;
@@ -3540,7 +3576,7 @@
 begin
       AutomatiskTjekkodeStyring1.Enabled := false;
       ReturpakkerfraDAO1.Checked := true;
-      PakkeshopNulstil.Visible := false;
+      btnNulstil.Visible := false;
       InitForm(FarveReturDAO,TitelReturDAO,UrlReturDAO);
       PanelValg2.Color := clGreen;
       PanelValg2.Font.Color := clWhite;
@@ -3567,7 +3603,7 @@
 begin
       AutomatiskTjekkodeStyring1.Enabled := false;
       Returpakkerfraboghandler1.Checked := true;
-      PakkeshopNulstil.Visible := false;
+      btnNulstil.Visible := false;
       InitForm(FarveReturBoghandler,TitelReturBoghandler,UrlReturBoghandler);
       PanelValg3.Color := clGreen;
       PanelValg3.Font.Color := clWhite;
@@ -3593,7 +3629,7 @@
 begin
       AutomatiskTjekkodeStyring1.Enabled := false;
       Budlevering1.Checked := true;
-      PakkeshopNulstil.Visible := false;
+      btnNulstil.Visible := false;
       InitForm(FarveBudlevering,TitelBudlevering,UrlBudlevering);
       PanelValg4.Color := clGreen;
       PanelValg4.Font.Color := clWhite;
@@ -3629,7 +3665,7 @@
 begin
       AutomatiskTjekkodeStyring1.Enabled := true;
       Pakkeshoplevering1.Checked := true;
-      PakkeshopNulstil.Visible := false;
+      btnNulstil.Visible := false;
       InitForm(FarvePakkeshoplevering,TitelPakkeshoplevering,UrlPakkeshoplevering);
       PanelValg5.Color := clGreen;
       PanelValg5.Font.Color := clWhite;
@@ -3666,7 +3702,7 @@
 begin
       AutomatiskTjekkodeStyring1.Enabled := false;
       Returpakkerfrapakkeshop1.Checked := true;
-      PakkeshopNulstil.Visible := false;
+      btnNulstil.Visible := false;
       InitForm(FarveReturPakkeshop,TitelReturPakkeshop,UrlReturPakkeshop);
       PanelValg6.Color := clGreen;
       PanelValg6.Font.Color := clWhite;
@@ -3709,7 +3745,7 @@
       menuIndlevering.Checked := true;
       AutomatiskTjekkodeStyring1.Enabled := false;
 
-      PakkeshopNulstil.Visible := false;
+      btnNulstil.Visible := false;
       InitForm(FarveIndlevering, TitelIndlevering, UrlReturPakkeshop);
       PanelValg7.Color := clGreen;
       PanelValg7.Font.Color := clWhite;
@@ -3997,7 +4033,7 @@
          BoghandlerNavnST.Caption := 'Prøv venligst igen om lidt...';
        end;
        KommentarST.Caption := Kommentar;
-       PakkeshopNulstil.Visible := true;
+       btnNulstil.Visible := true;
     end;
 
 end;
@@ -4583,6 +4619,24 @@
   until S2 = '';
 end;
 
+// ToDo: Færdiggør implementationen
+procedure TMainForm.PrintPakkeshopLabel( PakkeshopLabel : TPakkeshopLabel);
+begin
+    with Printer do
+    begin
+      BeginDoc();
+      Canvas.Font.Size := FontSizeRuteLille;
+
+      Canvas.Font.Size := FontSizeKorelisteLille;
+      Canvas.TextOut(XPosKoreliste,YPosKoreliste, PakkeshopLabel.Navn);
+
+
+      EndDoc();
+    end;
+
+end;
+
+
 procedure TMainForm.IndlesManglendeScanninger();
 var
   WebSvar : String;
@@ -5212,7 +5266,7 @@
 
   RuteNummerST.Caption := '';
   BoghandlerNavnST.Caption := '';
-  PakkeshopNulstil.Visible := true;
+  btnNulstil.Visible := true;
 
   if (strMessage <> '') then
   begin
@@ -5323,6 +5377,66 @@
   AReg.Free;
 end;
 
+
+function TMainForm.CheckUrl(url:string):boolean;
+var
+  hSession, hfile, hRequest: hInternet;
+  dwindex,dwcodelen :dword;
+  dwcode:array[1..20] of char;
+  res : pchar;
+begin
+  if pos('http://',lowercase(url))=0 then
+    url := 'http://'+url;
+  Result := false;
+  hSession := InternetOpen('InetURL:/1.0',
+                            INTERNET_OPEN_TYPE_PRECONFIG,
+                            nil,
+                            nil,
+                            0);
+  if assigned(hsession) then
+  begin
+    hfile := InternetOpenUrl(hsession,
+                             pchar(url),
+                             nil,
+                             0,
+                             INTERNET_FLAG_RELOAD,
+                             0);
+    dwIndex := 0;
+    dwCodeLen := 10;
+    HttpQueryInfo(hfile,
+                  HTTP_QUERY_STATUS_CODE,
+                  @dwcode,
+                  dwcodeLen,
+                  dwIndex);
+    res := pchar(@dwcode);
+    result:= (res ='200') or (res ='302');
+    if assigned(hfile) then
+      InternetCloseHandle(hfile);
+    InternetCloseHandle(hsession);
+  end;
+
+end;
+
+
+procedure TMainForm.RoundCornerOf(Control: TWinControl);
+var
+   R: TRect;
+   Rgn: HRGN;
+begin
+   with Control do
+   begin
+     R := ClientRect;
+//     rgn := CreateRoundRectRgn(R.Left, R.Top, R.Right, R.Bottom, 20, 20) ;
+     rgn := CreateRoundRectRgn(R.Left, R.Top, R.Right, R.Bottom, 25, 25) ;
+//     rgn := CreateRoundRectRgn(R.Left, R.Top, R.Right, R.Bottom, 30, 30) ;
+     Perform(EM_GETRECT, 0, lParam(@r)) ;
+     InflateRect(r, - 4, - 4) ;
+     Perform(EM_SETRECTNP, 0, lParam(@r)) ;
+     SetWindowRgn(Handle, rgn, True) ;
+     Invalidate;
+   end;
+end;
+
 procedure TMainForm.CheckPrintQue(tjektype : string);
 type
   TJobs  = array [0..1000] of JOB_INFO_1;
@@ -5426,65 +5540,6 @@
   end;
 end;
 
-function TMainForm.CheckUrl(url:string):boolean;
-var
-  hSession, hfile, hRequest: hInternet;
-  dwindex,dwcodelen :dword;
-  dwcode:array[1..20] of char;
-  res : pchar;
-begin
-  if pos('http://',lowercase(url))=0 then
-    url := 'http://'+url;
-  Result := false;
-  hSession := InternetOpen('InetURL:/1.0',
-                            INTERNET_OPEN_TYPE_PRECONFIG,
-                            nil,
-                            nil,
-                            0);
-  if assigned(hsession) then
-  begin
-    hfile := InternetOpenUrl(hsession,
-                             pchar(url),
-                             nil,
-                             0,
-                             INTERNET_FLAG_RELOAD,
-                             0);
-    dwIndex := 0;
-    dwCodeLen := 10;
-    HttpQueryInfo(hfile,
-                  HTTP_QUERY_STATUS_CODE,
-                  @dwcode,
-                  dwcodeLen,
-                  dwIndex);
-    res := pchar(@dwcode);
-    result:= (res ='200') or (res ='302');
-    if assigned(hfile) then
-      InternetCloseHandle(hfile);
-    InternetCloseHandle(hsession);
-  end;
-
-end;
-
-// 20150310: start
-procedure TMainForm.RoundCornerOf(Control: TWinControl);
-var
-   R: TRect;
-   Rgn: HRGN;
-begin
-   with Control do
-   begin
-     R := ClientRect;
-//     rgn := CreateRoundRectRgn(R.Left, R.Top, R.Right, R.Bottom, 20, 20) ;
-     rgn := CreateRoundRectRgn(R.Left, R.Top, R.Right, R.Bottom, 25, 25) ;
-//     rgn := CreateRoundRectRgn(R.Left, R.Top, R.Right, R.Bottom, 30, 30) ;
-     Perform(EM_GETRECT, 0, lParam(@r)) ;
-     InflateRect(r, - 4, - 4) ;
-     Perform(EM_SETRECTNP, 0, lParam(@r)) ;
-     SetWindowRgn(Handle, rgn, True) ;
-     Invalidate;
-   end;
-end;
-// 20150310: slut
 
 end.