--- dao/DelphiScanner/Main.pas 2015/08/20 20:34:08 2649 +++ dao/DelphiScanner/Main.pas 2015/08/20 20:58:26 2650 @@ -85,6 +85,7 @@ PanelManglendePakker4: TPanel; PanelManglendePakker5: TPanel; PanelManglendePakker6: TPanel; + PanelValg7: TPanel; function Explode(var a: TStrArray; Border, S: string): Integer; function BarCodeValid (ACode: string): boolean; @@ -150,6 +151,8 @@ procedure InitDirektelevering(); procedure InitPakkeshoplevering(); procedure InitReturFraPakkeshop(); + procedure InitIndleveringskode(); + procedure Altidprintepakkelabel1Click(Sender: TObject); procedure CheckBox2Click(Sender: TObject); procedure EKLoverforselClick(Sender: TObject); @@ -175,6 +178,8 @@ procedure TjekkerUrls(); // 20150310: start procedure RoundCornerOf(Control: TWinControl); + + procedure PanelValg7Click(Sender: TObject); // 20150310: slut private @@ -329,6 +334,12 @@ PanelValg6.Font.Color := clWindowText; end; + PanelValg7.Color := clBtnFace; + if PanelValg7.Enabled = true then + begin + PanelValg7.Font.Color := clWindowText; + end; + OpdaterListenButton01.Enabled := false; if (BladhusSted > 00) and (BladhusSted < Length(BladhusStedNavn)) then @@ -552,7 +563,7 @@ // Sætter lige en default panel størrelse MainForm.ClientWidth := 1000; - MainForm.ClientHeight := 700; + MainForm.ClientHeight := 750; // Læser parametre fra ini filen with TIniFile.Create(ChangeFileExt(Application.ExeName,'.ini')) do @@ -3412,6 +3423,7 @@ PrinterstatusStaticText1.Color := MainForm.Color; end; + procedure TMainForm.PanelValg1Click(Sender: TObject); begin Scanningtype := '1'; @@ -3454,6 +3466,15 @@ NulstilAutomatiskValg(); end; + +procedure TMainForm.PanelValg7Click(Sender: TObject); +begin + Scanningtype := '7'; + InitIndleveringskode(); + NulstilAutomatiskValg(); + +end; + procedure TMainForm.PanelValgAClick(Sender: TObject); begin // 20150311: start @@ -3988,6 +4009,42 @@ InitReturFraKunde(); end; +procedure TMainForm.InitIndleveringskode(); +begin + AutomatiskTjekkodeStyring1.Enabled := false; + Returpakkerfrapakkeshop1.Checked := true; + PakkeshopNulstil.Visible := false; + InitForm(FarveReturPakkeshop,TitelReturPakkeshop,UrlReturPakkeshop); + PanelValg7.Color := clGreen; + PanelValg7.Font.Color := clWhite; + CheckBox1.Enabled := false; + CheckBox2.Enabled := false; + Altidprintepakkelabel1.Enabled := false; + CheckBox2.Checked := false; + Altidprintepakkelabel1.Checked := false; + Sprgefterboghandlernummer1.Checked := false; + CheckBox1.Checked := false; + Sprgefterboghandlernummer1.Enabled := false; + Smpakker1.Enabled := false; + Storepakker1.Enabled := false; + RadioButton1.Enabled := false; + RadioButton2.Enabled := false; + ListBox1.Visible := true; + ListBox1.Items.Clear; + DownloadButton01.Enabled := false; + OpdaterListenButton01.Enabled := true; + EKLoverforsel.Enabled := false; + InitLillePakke(); + IndlesScanningLogFil(); + if BladhusSted = 0 then + begin + IndlesManglendeScanninger(); + end; + IdFTP1.Passive := true; + IdFTP1.PassiveUseControlHost := true; +end; + + procedure TMainForm.Storepakker1Click(Sender: TObject); begin InitStorPakke(); @@ -5504,7 +5561,7 @@ function TMainForm.getProddag() : String; begin // ShowMessage(LongDayNames[DayOfWeek(getProddato())]); - result := LongDayNames[DayOfWeek(getProddato())]; + result := FormatSettings.LongDayNames[DayOfWeek(getProddato())]; //result := 'lørdag'; // MENS VI TESTER kan vi fremtvinge lørdag situation her end;