Moved settings from Registry to AppData to prevent privilege requirements

Updated ESC/P codes to include emphasis and character pitch settings used on Tally Printers

BulkPrinting/BulkPrinting/BulkPrinting.csproj

@@ -13,7 +13,7 @@
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <TargetFrameworkProfile />
     <IsWebBootstrapper>false</IsWebBootstrapper>
-    <PublishUrl>C:\Users\Brett\Desktop\Bulk Printing Setup\</PublishUrl>
+    <PublishUrl>D:\BPSetup\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
     <UpdateEnabled>false</UpdateEnabled>
@@ -26,7 +26,7 @@
     <TargetCulture>en-ZA</TargetCulture>
     <ProductName>Bulk Printing</ProductName>
     <PublisherName>R-Group</PublisherName>
-    <ApplicationRevision>4</ApplicationRevision>
+    <ApplicationRevision>9</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>

BulkPrinting/BulkPrinting/BulkPrinting.csproj.user

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <PublishUrlHistory>C:\Users\Brett\Desktop\Bulk Printing Setup\|C:\Users\Brett\Desktop\R-Group Deploy\|publish\</PublishUrlHistory>
+    <PublishUrlHistory>D:\BPSetup\|C:\Users\Brett\Desktop\Bulk Printing Setup\|C:\Users\Brett\Desktop\R-Group Deploy\|publish\</PublishUrlHistory>
     <InstallUrlHistory />
     <SupportUrlHistory />
     <UpdateUrlHistory />

BulkPrinting/BulkPrinting/Configuration.cs

@@ -9,7 +9,7 @@ namespace BulkPrinting
 {
     public static class Configuration
     {
-        public const string ServerDN = "196.31.118.146";
+        public const string ServerDN = "196.31.118.146";//"localhost";
         public const string ServerPort = "443";//"50069";
         public const string MaxDBFileName = "maxdata.dat";
         public const string MaxDataPathName = "M@X";

BulkPrinting/BulkPrinting/Models.cs

@@ -8,6 +8,17 @@ using Newtonsoft.Json.Serialization;
 
 namespace BulkPrinting
 {
+    public class SavedSettings {
+        [JsonProperty("vendorId")]
+        public int VendorId { get; set; }
+
+        [JsonProperty("userId")]
+        public int UserId { get; set; }
+
+        [JsonProperty("username")]
+        public string Username { get; set; }
+    }
+
     public enum SessionModes {
         Invalid = 0,
         Offline = 1,

BulkPrinting/BulkPrinting/PrintAlignmentDialog.cs

@@ -52,22 +52,32 @@ namespace BulkPrinting
 
         private void btnAlignment_Click(object sender, EventArgs e)
         {
-            if (Globals.MaxPrinter.Open("Alignment")==0) return;
 
             var PrinterInitString = new StringBuilder();
-            PrinterInitString.Append(Printer.INITIALISE_PRINTER).Append(Printer.UNIDIRECTIONAL_OFF).Append(Printer.EMPHASISE_ON);
-            Globals.MaxPrinter.Print(PrinterInitString.ToString());
+            //PrinterInitString.Append(Printer.INITIALISE_PRINTER).Append(Printer.EMPHASISE_ON).Append(Printer.UNIDIRECTIONAL_OFF).Append(Printer.CHARPITCHELITE);
+            int initJobID = Globals.MaxPrinter.Open("Printer_Init");
+            if (initJobID == 0) return;
+            //Globals.MaxPrinter.Print(PrinterInitString.ToString());
+            Globals.MaxPrinter.Print(Printer.INITIALISE_PRINTER);
+            Globals.MaxPrinter.Print(Printer.UNIDIRECTIONAL_OFF);
+            Globals.MaxPrinter.Print(Printer.CHARPITCHELITE);
+            Globals.MaxPrinter.Print(Printer.EMPHASISE_ON);
+            //Globals.MaxPrinter.Close();
 
-            string AlignmentPage ="";// = Printer.UNIDIRECTIONAL_OFF;
+
+            //if (Globals.MaxPrinter.Open("Alignment")==0) return;
+
+            string AlignmentPage ="";
 
             for (var i = 0; i < 8; i++) //Two full pages of vouchers
             {
-                AlignmentPage += "\r\n\n\n" +
-                "[VOUCHER  PIN  CODE]     [VOUCHER  PIN  CODE]      [VOUCHER  PIN  CODE]     [VOUCHER  PIN  CODE]     [VOUCHER  PIN  CODE]\r\n\n" +
-                "[VOUCHER SERIAL NUM]     [VOUCHER SERIAL NUM]      [VOUCHER SERIAL NUM]     [VOUCHER SERIAL NUM]     [VOUCHER SERIAL NUM]\r\n" +
-                "[BATCHNO/SEQNO/PAGE]     [BATCHNO/SEQNO/PAGE]      [BATCHNO/SEQNO/PAGE]     [BATCHNO/SEQNO/PAGE]     [BATCHNO/SEQNO/PAGE]\r\n" +
-                "[VOUCHERDESCRIPTION]     [VOUCHERDESCRIPTION]      [VOUCHERDESCRIPTION]     [VOUCHERDESCRIPTION]     [VOUCHERDESCRIPTION]\r\n\n\n\n\n\n\n\n\n\n\n";
+                //AlignmentPage += "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789\r\n";
                 
+                AlignmentPage += "\r\n\n\n" +
+                "[--VOUCHER  PIN  CODE--]      [--VOUCHER  PIN  CODE--]      [--VOUCHER  PIN  CODE--]       [--VOUCHER  PIN  CODE--]      [--VOUCHER  PIN  CODE--]\r\n\n" +
+                "[--VOUCHER SERIAL NUM--]      [--VOUCHER SERIAL NUM--]      [--VOUCHER SERIAL NUM--]       [--VOUCHER SERIAL NUM--]      [--VOUCHER SERIAL NUM--]\r\n" +
+                "[--BATCHNO/SEQNO/PAGE--]      [--BATCHNO/SEQNO/PAGE--]      [--BATCHNO/SEQNO/PAGE--]       [--BATCHNO/SEQNO/PAGE--]      [--BATCHNO/SEQNO/PAGE--]\r\n" +
+                "[--VOUCHERDESCRIPTION--]      [--VOUCHERDESCRIPTION--]      [--VOUCHERDESCRIPTION--]       [--VOUCHERDESCRIPTION--]      [--VOUCHERDESCRIPTION--]\r\n\n\n\n\n\n\n\n\n\n\n";
             }
             
             Globals.MaxPrinter.Print(AlignmentPage);

BulkPrinting/BulkPrinting/Printer.cs

@@ -19,6 +19,9 @@ namespace BulkPrinting
         public const string CHARPITCHS2 = "\x1B\x36";
         public const string CHARPITCHPUB = "\x1B\x21\x5a";
         public const string CHARPITCHS0 = "\x1B\x21\x40";
+        public const string CHARPITCHPICO = "\x1B\x50";
+        public const string CHARPITCHELITE = "\x1B\x4D";
+        public const string CONDENSED = "\x1B\x0F";
         public const string INITIALISE_PRINTER = "\x1B\x40";
         public const string EMPHASISE_ON = "\x1B\x45";
         public const string EMPHASISE_OFF = "\x1B\x46";

BulkPrinting/BulkPrinting/UserLoginForm.cs

@@ -171,12 +171,12 @@ namespace BulkPrinting
         {
             Globals.LogSyncWaiting = false; //Ensure LogSync starts in correct state
             this.lblHDDSerial.Text = Globals.HDDSerialNumber;
-            this.txtUsername.Text = Utility.RegFetch("Username");
-            this.txtUserID.Text = Utility.RegFetch("UserID");
+            this.txtUsername.Text = Utility.LoadSetting("Username");
+            this.txtUserID.Text = Utility.LoadSetting("UserID");
             if (this.txtUsername.Text != "") {
                 chkRemember.Checked = true;
             }
-            this.txtVendorID.Text = Utility.RegFetch("VendorID");
+            this.txtVendorID.Text = Utility.LoadSetting("VendorID");
             if (this.txtVendorID.Text != "")
             {
                 txtVendorID.Enabled = false;

BulkPrinting/BulkPrinting/Utility.cs

@@ -57,6 +57,7 @@ namespace BulkPrinting
 
             HttpWebRequest request = WebRequest.Create("https://" + Configuration.ServerDN + ":" + Configuration.ServerPort + "/api/login") as HttpWebRequest;
             request.ServerCertificateValidationCallback = delegate { return true; };
+
             request.Method = "POST";
             request.ContentType = "application/json";
             request.ContentLength = data.Length;
@@ -76,20 +77,14 @@ namespace BulkPrinting
                 Globals.SessionData = JsonConvert.DeserializeObject<OKResponse>(responseString);
                 if (RememberMe == true)
                 {
-                    RegSave("Username", UserLoginData.Username);
-                    RegSave("UserID", UserLoginData.UserId.ToString());
+                    SaveSetting("Username", UserLoginData.Username);
+                    SaveSetting("UserID", UserLoginData.UserId.ToString());
                 }
                 else {
-                    RegSave("Username", "");
-                    RegSave("UserID", "");
+                    SaveSetting("Username", "");
+                    SaveSetting("UserID", "");
                 }
-                RegSave("VendorID", UserLoginData.VendorId.ToString());
-
-                //TODO: Remove ovveride
-                RegSave("EncryptedDBPassword", BitConverter.ToString(Globals.SessionData.Credentials.Payload.EncryptedDatabasePassword));
-                RegSave("SessionData", BitConverter.ToString(Globals.SessionData.Credentials.Salt));
-                RegSave("SessionValue", Globals.SessionData.Credentials.Iterations.ToString());
-
+                SaveSetting("VendorID", UserLoginData.VendorId.ToString());
 
                 Globals.SessionEncryptedDatabasePassword = Globals.SessionData.Credentials.Payload.EncryptedDatabasePassword;
                 Globals.SessionSalt = Globals.SessionData.Credentials.Salt;
@@ -97,7 +92,7 @@ namespace BulkPrinting
 
                 return true;
             }
-            catch (WebException e) {
+            catch (WebException) {
                 return false;
             }
         }
@@ -145,7 +140,7 @@ namespace BulkPrinting
                 return false;
             }
         }
-
+        /*
         private static bool RegSave(string Key, string Value)
         {
             bool Result;
@@ -178,7 +173,73 @@ namespace BulkPrinting
             }
             return Result;
         }
+        */
 
+        private static bool SaveSetting(string Key, string Value)
+        {
+            SavedSettings StoredValues = LoadSavedSettings();
+            switch (Key)
+            {
+                case "Username":
+                    StoredValues.Username = Value;
+                    break;
+                case "UserID":
+                    if (Value == "")
+                        StoredValues.UserId = 0;
+                    else
+                        StoredValues.UserId = int.Parse(Value);
+                    break;
+                case "VendorID":
+                    if (Value == "")
+                        StoredValues.VendorId = 0;
+                    else
+                        StoredValues.VendorId = int.Parse(Value);
+                    break;
+                default:
+                    return false;
+            }
+            string MaxAppDataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), Configuration.MaxDataPathName);
+            string MaxSettingsFilePath = Path.Combine(MaxAppDataPath, "maxsettings.dat");
+            File.WriteAllText(MaxSettingsFilePath, JsonConvert.SerializeObject(StoredValues));
+            return true;
+        }
+
+        public static string LoadSetting(string Key)
+        {
+            SavedSettings StoredValues = LoadSavedSettings();
+            string ReturnVal = "";
+            switch (Key)
+            {
+                case "Username":
+                    ReturnVal = StoredValues.Username;
+                    break;
+                case "UserID":
+                    ReturnVal = StoredValues.UserId.ToString();
+                    break;
+                case "VendorID":
+                    ReturnVal = StoredValues.VendorId.ToString();
+                    break;
+                default:
+                    return "";
+            }
+            if (ReturnVal == "0")
+                return "";
+            return ReturnVal;
+        }
+
+        private static SavedSettings LoadSavedSettings() {
+            string MaxAppDataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), Configuration.MaxDataPathName);
+            string MaxSettingsFilePath = Path.Combine(MaxAppDataPath, "maxsettings.dat");
+            SavedSettings StoredValues = new SavedSettings();
+            if (File.Exists(MaxSettingsFilePath)) {
+                StoredValues = JsonConvert.DeserializeObject<SavedSettings>(File.ReadAllText(MaxSettingsFilePath));
+            }
+            else {
+                File.WriteAllText(MaxSettingsFilePath, JsonConvert.SerializeObject(StoredValues));
+            }
+            return StoredValues;
+        }
+        
         public static byte[] Transform(ICryptoTransform transform, byte[] input)
         {
             using (var memoryStream = new MemoryStream())
@@ -331,7 +392,11 @@ namespace BulkPrinting
             bool IsReprint;
 
             var PrinterInitString = new StringBuilder();
-            PrinterInitString.Append(Printer.INITIALISE_PRINTER).Append(Printer.UNIDIRECTIONAL_OFF).Append(Printer.EMPHASISE_ON);
+            PrinterInitString.Append(Printer.INITIALISE_PRINTER).Append(Printer.EMPHASISE_ON).Append(Printer.UNIDIRECTIONAL_OFF).Append(Printer.CHARPITCHELITE);
+            int initJobID = Globals.MaxPrinter.Open("Printer_Init");
+            if (initJobID == 0) return;
+            Globals.MaxPrinter.Print(PrinterInitString.ToString());
+            Globals.MaxPrinter.Close();
 
             List<EventLog> LogEvents = new List<EventLog>();
 
@@ -366,42 +431,39 @@ namespace BulkPrinting
                     if (VoucherCount >= 5 || TotalCount == (EndSeqNo - StartSeqNo))
                     {
                         RowCount++;
-                        string PrintRow = "\r\n\n\n";
-                        //var PrintRowToo = new StringBuilder();
+                        string PrintRow = "\r\n\n\n  ";
                         for (int Column = 0; Column < VoucherRow.Count(); Column++)
                         {
                             IndividualVoucher = VoucherRow[Column];
-                            PrintRow += (Column == 2 ? " " : "") + ("  " + IndividualVoucher.DecryptedPIN).PadRight(25, ' ');
-                            //PrintRowToo.Append(Column == 2 ? " " : "").AppendFormat("  {0:25}", IndividualVoucher.DecryptedPIN);
+                            PrintRow += (Column == 2 ? " " : "") + ("  " + IndividualVoucher.DecryptedPIN).PadRight(30, ' ');
                         }
-                        PrintRow = PrintRow.TrimEnd() + "\r\n\n";
+                        PrintRow = PrintRow.TrimEnd() + "\r\n\n  ";
                         for (int Column = 0; Column < VoucherRow.Count(); Column++)
                         {
                             IndividualVoucher = VoucherRow[Column];
                             SerialNumberTrimmed = IndividualVoucher.Serial;
-                            if (SerialNumberTrimmed.Length > 20)
+                            if (SerialNumberTrimmed.Length > 24)
                             {
-                                SerialNumberTrimmed = SerialNumberTrimmed.Substring(0, 20);
+                                SerialNumberTrimmed = SerialNumberTrimmed.Substring(0, 24);
                             }
-                            PrintRow += (Column == 2 ? " " : "") + SerialNumberTrimmed.PadRight(25, ' ');
+                            PrintRow += (Column == 2 ? " " : "") + SerialNumberTrimmed.PadRight(30, ' ');
                         }
-                        PrintRow = PrintRow.TrimEnd() + "\r\n";
+                        PrintRow = PrintRow.TrimEnd() + "\r\n  ";
                         for (int Column = 0; Column < VoucherRow.Count(); Column++)
                         {
                             IndividualVoucher = VoucherRow[Column];
-                            PrintRow += (Column == 2 ? " " : "") + String.Format("{0}/{1}/{2}", IndividualVoucher.BatchId, IndividualVoucher.SequenceNumber, PageCount).PadRight(25, ' ');
+                            PrintRow += (Column == 2 ? " " : "") + String.Format("{0}/{1}/{2}", IndividualVoucher.BatchId, IndividualVoucher.SequenceNumber, PageCount).PadRight(30, ' ');
                         }
-                        PrintRow = PrintRow.TrimEnd() + "\r\n";
+                        PrintRow = PrintRow.TrimEnd() + "\r\n  ";
                         for (int Column = 0; Column < VoucherRow.Count(); Column++)
                         {
                             IndividualVoucher = VoucherRow[Column];
-                            PrintRow += (Column == 2 ? " " : "") + IndividualVoucher.Description.PadRight(25, ' ');
+                            PrintRow += (Column == 2 ? " " : "") + IndividualVoucher.Description.PadRight(30, ' ');
                         }
                         PrintRow = PrintRow.TrimEnd() + "\r\n\n\n\n\n\n\n\n\n\n\n";
                         int JobID = Globals.MaxPrinter.Open("Vouchers");
                         if (JobID == 0) return;
                         Globals.MaxPrinter.Print(PrintRow);
-                        Globals.MaxPrinter.Print(PrinterInitString.ToString());
                         Globals.MaxPrinter.Close();
                         foreach (PrintVoucher PrintedVoucher in VoucherRow)
                         {