Add print mode setting for select 12cpi, 10cpi or mixed cpi modes.

BulkPrinting/BulkPrinting/Migrations.cs

@@ -20,7 +20,7 @@ namespace BulkPrinting
                 throw new Exception(String.Format("Invalid migration value: {0}", result));
             }
 
-            if (startingMigration > 6)
+            if (startingMigration > 7)
             {
                 throw new Exception("Database is for a newer version of this application. Please upgrade and try again.");
             }
@@ -48,6 +48,10 @@ namespace BulkPrinting
             {
                 Migration6(db);
             }
+            if (startingMigration < 7)
+            {
+                Migration7(db);
+            }
             //Add further migration executions here - Migration = '1', '2', '3' etc
 
             return;
@@ -282,5 +286,17 @@ namespace BulkPrinting
                 "UPDATE Parameters SET Value='6' WHERE Key='Migration'"
             );
         }
+
+        public static bool Migration7(DBHelper db)
+        {
+            return ApplyMigrationQueries(
+                db, null,
+
+                "INSERT INTO Parameters (Key, Value) VALUES ('PrintMode', " + Utility.PrintMode.MixedCPI.ToString("d") + ")",
+
+                // IMPORTANT
+                "UPDATE Parameters SET Value='7' WHERE Key='Migration'"
+            );
+        }
     }
 }

BulkPrinting/BulkPrinting/PrintAlignmentDialog.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Data.SQLite;
-using System.Drawing;
 using System.Threading;
 using System.Windows.Forms;
 
@@ -58,31 +57,26 @@ namespace BulkPrinting
         private void btnAlignment_Click(object sender, EventArgs e)
         {
 
-            var PrinterInitString = Utility.GetPrinterInitString(Globals.DB);
-            int initJobID = Globals.MaxPrinter.Open("Printer_Init");
+            var printSettings = Utility.GetPrintSettings(Globals.DB);
+
+            int initJobID = Globals.MaxPrinter.Open("Alignment");
             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();
+            Globals.MaxPrinter.Print(printSettings.InitCodes);
 
+            //string row = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789\r\n";
 
-            //if (Globals.MaxPrinter.Open("Alignment")==0) return;
+            string row =
+                    "\r\n\n\n  " + printSettings.PinStartCodes +
+                    Utility.FormatPrintAlignmentRow(printSettings.PinCpi, "VOUCHER PIN") + printSettings.PinEndCodes + "\r\n\n  " +
+                    Utility.FormatPrintAlignmentRow(printSettings.VoucherCpi, "SERIAL NUMBER") + "\r\n  " +
+                    Utility.FormatPrintAlignmentRow(printSettings.VoucherCpi, "BATCH DETAILS") + "\r\n  " +
+                    Utility.FormatPrintAlignmentRow(printSettings.VoucherCpi, "DESCRIPTION") + "\r\n  " +
+                    Utility.FormatPrintAlignmentRow(printSettings.VoucherCpi, "VENDOR DETAILS") + "\r\n\n\n\n\n\n\n\n\n\n";
 
             string AlignmentPage ="";
-
             for (var i = 0; i < 8; i++) //Two full pages of vouchers
             {
-                //AlignmentPage += "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789\r\n";
-                
-                AlignmentPage += "\r\n\n\n" +
-                "\x1B\x50[-VOUCHER PIN CODE-]     [-VOUCHER PIN CODE-]     [-VOUCHER PIN CODE-]      [-VOUCHER PIN CODE-]     [-VOUCHER PIN CODE-]\x1B\x4D\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" +
-                "[--VENDOR          ID--]      [--VENDOR          ID--]      [--VENDOR          ID--]       [--VENDOR          ID--]      [--VENDOR          ID--]\r\n\n\n\n\n\n\n\n\n\n";
+                AlignmentPage += row;
             }
             
             Globals.MaxPrinter.Print(AlignmentPage);
@@ -174,11 +168,13 @@ namespace BulkPrinting
             dialog.InitString = Utility.GetSavedParameter(Globals.DB, "PrinterInitString");
             dialog.VendorName = Utility.GetSavedParameter(Globals.DB, "VendorName");
             dialog.EnableBoldPrinting = Utility.GetSavedParameterAsBoolean(Globals.DB, "EnableBoldPrinting");
+            dialog.PrintMode = (Utility.PrintMode)Enum.Parse(typeof(Utility.PrintMode), Utility.GetSavedParameter(Globals.DB, "PrintMode"));
             if (dialog.ShowDialog() == DialogResult.OK)
             {
                 Utility.UpdateSavedParameter(Globals.DB, "PrinterInitString", dialog.InitString);
                 Utility.UpdateSavedParameter(Globals.DB, "VendorName", dialog.VendorName);
                 Utility.UpdateSavedParameter(Globals.DB, "EnableBoldPrinting", dialog.EnableBoldPrinting);
+                Utility.UpdateSavedParameter(Globals.DB, "PrintMode", dialog.PrintMode.ToString("d"));
             }
         }
     }

BulkPrinting/BulkPrinting/PrinterSettingsForm.Designer.cs

@@ -39,26 +39,32 @@
             this.panel1 = new System.Windows.Forms.Panel();
             this.printQualityFastRadioButton = new System.Windows.Forms.RadioButton();
             this.printQualityHighRadioButton = new System.Windows.Forms.RadioButton();
+            this.label4 = new System.Windows.Forms.Label();
+            this.panel2 = new System.Windows.Forms.Panel();
+            this.mixedCpiRadioButton = new System.Windows.Forms.RadioButton();
+            this.manual10CpiRadioButton = new System.Windows.Forms.RadioButton();
+            this.manual12CpiRadioButton = new System.Windows.Forms.RadioButton();
             this.panel1.SuspendLayout();
+            this.panel2.SuspendLayout();
             this.SuspendLayout();
             // 
             // label1
             // 
             this.label1.AutoSize = true;
             this.label1.ForeColor = System.Drawing.Color.White;
-            this.label1.Location = new System.Drawing.Point(13, 104);
+            this.label1.Location = new System.Drawing.Point(13, 190);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(155, 17);
-            this.label1.TabIndex = 8;
+            this.label1.TabIndex = 10;
             this.label1.Text = "Printer Init String (Hex):";
             this.label1.Visible = false;
             // 
             // initStringTextBox
             // 
-            this.initStringTextBox.Location = new System.Drawing.Point(174, 104);
+            this.initStringTextBox.Location = new System.Drawing.Point(174, 190);
             this.initStringTextBox.Name = "initStringTextBox";
             this.initStringTextBox.Size = new System.Drawing.Size(475, 22);
-            this.initStringTextBox.TabIndex = 2;
+            this.initStringTextBox.TabIndex = 6;
             this.initStringTextBox.Visible = false;
             // 
             // resetButton
@@ -67,7 +73,7 @@
             this.resetButton.FlatAppearance.BorderColor = System.Drawing.Color.Black;
             this.resetButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.resetButton.ForeColor = System.Drawing.Color.White;
-            this.resetButton.Location = new System.Drawing.Point(16, 73);
+            this.resetButton.Location = new System.Drawing.Point(13, 166);
             this.resetButton.Name = "resetButton";
             this.resetButton.Size = new System.Drawing.Size(137, 28);
             this.resetButton.TabIndex = 5;
@@ -82,7 +88,7 @@
             this.okButton.FlatAppearance.BorderColor = System.Drawing.Color.Black;
             this.okButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.okButton.ForeColor = System.Drawing.Color.White;
-            this.okButton.Location = new System.Drawing.Point(446, 73);
+            this.okButton.Location = new System.Drawing.Point(443, 166);
             this.okButton.Name = "okButton";
             this.okButton.Size = new System.Drawing.Size(100, 28);
             this.okButton.TabIndex = 3;
@@ -96,7 +102,7 @@
             this.cancelButton.FlatAppearance.BorderColor = System.Drawing.Color.Black;
             this.cancelButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.cancelButton.ForeColor = System.Drawing.Color.White;
-            this.cancelButton.Location = new System.Drawing.Point(552, 73);
+            this.cancelButton.Location = new System.Drawing.Point(549, 166);
             this.cancelButton.Name = "cancelButton";
             this.cancelButton.Size = new System.Drawing.Size(100, 28);
             this.cancelButton.TabIndex = 4;
@@ -110,7 +116,7 @@
             this.label2.Location = new System.Drawing.Point(13, 13);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(99, 17);
-            this.label2.TabIndex = 6;
+            this.label2.TabIndex = 7;
             this.label2.Text = "Vendor Name:";
             // 
             // vendorNameTextBox
@@ -125,10 +131,10 @@
             // 
             this.label3.AutoSize = true;
             this.label3.ForeColor = System.Drawing.Color.White;
-            this.label3.Location = new System.Drawing.Point(13, 43);
+            this.label3.Location = new System.Drawing.Point(13, 135);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(89, 17);
-            this.label3.TabIndex = 7;
+            this.label3.TabIndex = 9;
             this.label3.Text = "Print Quality:";
             // 
             // panel1
@@ -136,14 +142,15 @@
             this.panel1.AutoSize = true;
             this.panel1.Controls.Add(this.printQualityFastRadioButton);
             this.panel1.Controls.Add(this.printQualityHighRadioButton);
-            this.panel1.Location = new System.Drawing.Point(174, 41);
+            this.panel1.Location = new System.Drawing.Point(174, 133);
             this.panel1.Name = "panel1";
             this.panel1.Size = new System.Drawing.Size(174, 24);
-            this.panel1.TabIndex = 1;
+            this.panel1.TabIndex = 2;
             // 
             // printQualityFastRadioButton
             // 
             this.printQualityFastRadioButton.AutoSize = true;
+            this.printQualityFastRadioButton.Checked = true;
             this.printQualityFastRadioButton.ForeColor = System.Drawing.Color.White;
             this.printQualityFastRadioButton.Location = new System.Drawing.Point(3, 0);
             this.printQualityFastRadioButton.Name = "printQualityFastRadioButton";
@@ -161,17 +168,73 @@
             this.printQualityHighRadioButton.Name = "printQualityHighRadioButton";
             this.printQualityHighRadioButton.Size = new System.Drawing.Size(106, 21);
             this.printQualityHighRadioButton.TabIndex = 1;
-            this.printQualityHighRadioButton.TabStop = true;
             this.printQualityHighRadioButton.Text = "High Quality";
             this.printQualityHighRadioButton.UseVisualStyleBackColor = true;
             // 
+            // label4
+            // 
+            this.label4.AutoSize = true;
+            this.label4.ForeColor = System.Drawing.Color.White;
+            this.label4.Location = new System.Drawing.Point(13, 48);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(80, 17);
+            this.label4.TabIndex = 8;
+            this.label4.Text = "Print Mode:";
+            // 
+            // panel2
+            // 
+            this.panel2.Controls.Add(this.mixedCpiRadioButton);
+            this.panel2.Controls.Add(this.manual10CpiRadioButton);
+            this.panel2.Controls.Add(this.manual12CpiRadioButton);
+            this.panel2.Location = new System.Drawing.Point(174, 42);
+            this.panel2.Name = "panel2";
+            this.panel2.Size = new System.Drawing.Size(475, 85);
+            this.panel2.TabIndex = 1;
+            // 
+            // mixedCpiRadioButton
+            // 
+            this.mixedCpiRadioButton.AutoSize = true;
+            this.mixedCpiRadioButton.Checked = true;
+            this.mixedCpiRadioButton.ForeColor = System.Drawing.Color.White;
+            this.mixedCpiRadioButton.Location = new System.Drawing.Point(3, 60);
+            this.mixedCpiRadioButton.Name = "mixedCpiRadioButton";
+            this.mixedCpiRadioButton.Size = new System.Drawing.Size(221, 21);
+            this.mixedCpiRadioButton.TabIndex = 2;
+            this.mixedCpiRadioButton.TabStop = true;
+            this.mixedCpiRadioButton.Text = "Mixed CPI (EPSON mode only)";
+            this.mixedCpiRadioButton.UseVisualStyleBackColor = true;
+            // 
+            // manual10CpiRadioButton
+            // 
+            this.manual10CpiRadioButton.AutoSize = true;
+            this.manual10CpiRadioButton.ForeColor = System.Drawing.Color.White;
+            this.manual10CpiRadioButton.Location = new System.Drawing.Point(3, 32);
+            this.manual10CpiRadioButton.Name = "manual10CpiRadioButton";
+            this.manual10CpiRadioButton.Size = new System.Drawing.Size(208, 21);
+            this.manual10CpiRadioButton.TabIndex = 1;
+            this.manual10CpiRadioButton.Text = "10 CPI, manual printer setup";
+            this.manual10CpiRadioButton.UseVisualStyleBackColor = true;
+            // 
+            // manual12CpiRadioButton
+            // 
+            this.manual12CpiRadioButton.AutoSize = true;
+            this.manual12CpiRadioButton.ForeColor = System.Drawing.Color.White;
+            this.manual12CpiRadioButton.Location = new System.Drawing.Point(4, 4);
+            this.manual12CpiRadioButton.Name = "manual12CpiRadioButton";
+            this.manual12CpiRadioButton.Size = new System.Drawing.Size(208, 21);
+            this.manual12CpiRadioButton.TabIndex = 0;
+            this.manual12CpiRadioButton.Text = "12 CPI, manual printer setup";
+            this.manual12CpiRadioButton.UseVisualStyleBackColor = true;
+            // 
             // PrinterSettingsForm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(7)))), ((int)(((byte)(63)))), ((int)(((byte)(145)))));
-            this.ClientSize = new System.Drawing.Size(661, 109);
+            this.ClientSize = new System.Drawing.Size(661, 199);
             this.ControlBox = false;
+            this.Controls.Add(this.panel2);
+            this.Controls.Add(this.label4);
             this.Controls.Add(this.panel1);
             this.Controls.Add(this.label3);
             this.Controls.Add(this.vendorNameTextBox);
@@ -188,6 +251,8 @@
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.PrinterSettingsForm_FormClosing);
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
+            this.panel2.ResumeLayout(false);
+            this.panel2.PerformLayout();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -206,5 +271,10 @@
         private System.Windows.Forms.Panel panel1;
         private System.Windows.Forms.RadioButton printQualityFastRadioButton;
         private System.Windows.Forms.RadioButton printQualityHighRadioButton;
+        private System.Windows.Forms.Label label4;
+        private System.Windows.Forms.Panel panel2;
+        private System.Windows.Forms.RadioButton mixedCpiRadioButton;
+        private System.Windows.Forms.RadioButton manual10CpiRadioButton;
+        private System.Windows.Forms.RadioButton manual12CpiRadioButton;
     }
 }

BulkPrinting/BulkPrinting/PrinterSettingsForm.cs

@@ -29,6 +29,46 @@ namespace BulkPrinting
             }
         }
 
+        public Utility.PrintMode PrintMode
+        {
+            get
+            {
+                if (manual12CpiRadioButton.Checked)
+                {
+                    return Utility.PrintMode.Manual12CPI;
+                }
+                else if (manual10CpiRadioButton.Checked)
+                {
+                    return Utility.PrintMode.Manual10CPI;
+                }
+                else if (mixedCpiRadioButton.Checked)
+                {
+                    return Utility.PrintMode.MixedCPI;
+                }
+                else
+                {
+                    throw new Exception("Print mode not selected");
+                }
+            }
+            set
+            {
+                switch(value)
+                {
+                    case Utility.PrintMode.Manual12CPI:
+                        manual12CpiRadioButton.Checked = true;
+                        break;
+                    case Utility.PrintMode.Manual10CPI:
+                        manual10CpiRadioButton.Checked = true;
+                        break;
+                    case Utility.PrintMode.MixedCPI:
+                        mixedCpiRadioButton.Checked = true;
+                        break;
+                    default:
+                        throw new Exception("Invalid print mode");
+                }
+            }
+        }
+
         public string InitString
         {
             get { return initStringTextBox.Text.Trim(); }

BulkPrinting/BulkPrinting/Properties/AssemblyInfo.cs

@@ -33,4 +33,4 @@ using System.Runtime.InteropServices;
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyFileVersion("1.11")]
+[assembly: AssemblyFileVersion("1.12")]

BulkPrinting/BulkPrinting/Utility.cs

@@ -21,6 +21,17 @@ namespace BulkPrinting
         [DllImport("user32.dll", SetLastError = true)]
         public static extern bool PostMessage(HandleRef hWnd, uint Msg, IntPtr wParam, IntPtr lParam);
 
+        public enum PrintMode { Manual10CPI = 1, Manual12CPI = 2, MixedCPI = 3 }
+
+        public class PrintSettings
+        {
+            public string InitCodes;
+            public string PinStartCodes;
+            public string PinEndCodes;
+            public int PinCpi;
+            public int VoucherCpi;
+        }
+
         public static byte[] HexStringToBytes(string hex)
         {
             int numChars = hex.Length;
@@ -35,15 +46,59 @@ namespace BulkPrinting
             return bytes;
         }
 
-        public static string GetPrinterInitString(DBHelper db)
+        public static PrintSettings GetPrintSettings(DBHelper db)
         {
-            //var hex = GetSavedParameter(db, "PrinterInitString");
-            var hex = Globals.DefaultPrinterInitString;
+            string initCodes;
+
+            var printMode = (PrintMode)Enum.Parse(typeof(PrintMode), GetSavedParameter(Globals.DB, "PrintMode"));
+            
+            if (printMode == PrintMode.MixedCPI)
+            {
+                //var hex = GetSavedParameter(db, "PrinterInitString");
+                initCodes = Encoding.ASCII.GetString(HexStringToBytes(Globals.DefaultPrinterInitString));
+            }
+            else
+            {
+                initCodes = "";
+            }
+
             if (GetSavedParameterAsBoolean(db, "EnableBoldPrinting"))
             {
-                hex += "1B45"; // Emphasize on
+                initCodes += Printer.EMPHASISE_ON;
+            }
+
+            switch (printMode)
+            {
+                case PrintMode.Manual12CPI:
+                    return new PrintSettings
+                    {
+                        InitCodes = initCodes,
+                        PinCpi = 12,
+                        VoucherCpi = 12,
+                        PinStartCodes = "",
+                        PinEndCodes = ""
+                    };
+                case PrintMode.Manual10CPI:
+                    return new PrintSettings
+                    {
+                        InitCodes = initCodes,
+                        PinCpi = 10,
+                        VoucherCpi = 10,
+                        PinStartCodes = "",
+                        PinEndCodes = ""
+                    };
+                case PrintMode.MixedCPI:
+                    return new PrintSettings
+                    {
+                        InitCodes = initCodes,
+                        PinCpi = 10,
+                        VoucherCpi = 12,
+                        PinStartCodes = Printer.CHARPITCHPICO,
+                        PinEndCodes = Printer.CHARPITCHELITE
+                    };
+                default:
+                    throw new Exception("Invalid print mode");
             }
-            return Encoding.ASCII.GetString(HexStringToBytes(hex));
         }
 
         public static string TrimRepeats(string value, string substring)
@@ -431,6 +486,63 @@ namespace BulkPrinting
                 new SQLiteParameter("@Value", Convert.ToString(value))) > 0;
         }
 
+        public static string PadBoth(string value, int width)
+        {
+            if (value.Length >= width)
+            {
+                return value.Substring(0, width);
+            }
+            else
+            {
+                int remainder = width - value.Length;
+                int before = remainder / 2;
+                return new StringBuilder(width)
+                    .Append('-', before)
+                    .Append(value)
+                    .Append('-', remainder - before)
+                    .ToString();
+            }
+        }
+
+        public static string FormatVoucherColumn(int column, int cpi, string contents)
+        {
+            string spacer = column == 3 ? " " : "";
+            if (cpi == 12)
+            {
+                return String.Format("{0}{1}      ", spacer, contents.PadRight(24).Substring(0, 24));
+            }
+            else if (cpi == 10)
+            {
+                return String.Format("{0}{1}     ", spacer, contents.PadRight(20).Substring(0, 20));
+            }
+            throw new Exception("Invalid print CPI");
+        }
+
+        public static string FormatPrintAlignmentRow(int cpi, string contents)
+        {
+            string block;
+            if (cpi == 12)
+            {
+                block = PadBoth(contents, 22);
+            }
+            else if (cpi == 10)
+            {
+                block = PadBoth(contents, 18);
+            }
+            else
+            {
+                throw new Exception("Invalid print CPI");
+            }
+            block = "[" + block + "]";
+
+            string row = "";
+            for (int col = 0; col < 5; col++)
+            {
+                row += FormatVoucherColumn(col, cpi, block);
+            }
+            return row;
+        }
+
         public static void PrintVouchers(DBHelper db, int BatchId, int StartSeqNo, int EndSeqNo)
         {
 
@@ -438,7 +550,6 @@ namespace BulkPrinting
             int RowCount = 0;
             int PageCount = (int) Math.Ceiling(((decimal)StartSeqNo)/20);
             int TotalCount = 0;
-            string SerialNumberTrimmed;
             bool IsReprint;
 
             string VendorId = GetSavedParameter(db, "VendorName").Trim();
@@ -446,16 +557,12 @@ namespace BulkPrinting
             {
                 VendorId = Globals.SessionData.Credentials.Payload.Vendor.id.ToString();
             }
-            else if (VendorId.Length > 24)
-            {
-                VendorId = VendorId.Substring(0, 24);
-            }
 
-            var PrinterInitString = GetPrinterInitString(db);
+            var printSettings = GetPrintSettings(db);
+
             int initJobID = Globals.MaxPrinter.Open("Vouchers");
             if (initJobID == 0) return;
-            Globals.MaxPrinter.Print(PrinterInitString.ToString());
-            //Globals.MaxPrinter.Close();
+            Globals.MaxPrinter.Print(printSettings.InitCodes);
 
             List<EventLog> LogEvents = new List<EventLog>();
 
@@ -467,8 +574,6 @@ namespace BulkPrinting
             {
                 using (SQLiteDataReader read = Command.ExecuteReader())
                 {
-                    //int JobID = Globals.MaxPrinter.Open("Vouchers");
-                    //if (JobID == 0) return;
                     while (read.Read())
                     {
                         VoucherCount++;
@@ -491,40 +596,35 @@ namespace BulkPrinting
                         if (VoucherCount >= 5 || TotalCount == (EndSeqNo - StartSeqNo))
                         {
                             RowCount++;
-                            string PrintRow = "\r\n\n\n\x1B\x50  ";
+                            string PrintRow = "\r\n\n\n  " + printSettings.PinStartCodes;
                             for (int Column = 0; Column < VoucherRow.Count(); Column++)
                             {
                                 IndividualVoucher = VoucherRow[Column];
-                                PrintRow += (Column == 3 ? " " : "") + (IndividualVoucher.DecryptedPIN).PadRight(25, ' ');
+                                PrintRow += FormatVoucherColumn(Column, printSettings.PinCpi, IndividualVoucher.DecryptedPIN);
                             }
-                            PrintRow = PrintRow.TrimEnd() + "\x1B\x4D\r\n\n  ";
+                            PrintRow = PrintRow.TrimEnd() + printSettings.PinEndCodes + "\r\n\n  ";
                             for (int Column = 0; Column < VoucherRow.Count(); Column++)
                             {
                                 IndividualVoucher = VoucherRow[Column];
-                                SerialNumberTrimmed = IndividualVoucher.Serial;
-                                if (SerialNumberTrimmed.Length > 24)
-                                {
-                                    SerialNumberTrimmed = SerialNumberTrimmed.Substring(0, 24);
-                                }
-                                PrintRow += (Column == 3 ? " " : "") + SerialNumberTrimmed.PadRight(30, ' ');
+                                PrintRow += FormatVoucherColumn(Column, printSettings.VoucherCpi, IndividualVoucher.Serial);
                             }
                             PrintRow = PrintRow.TrimEnd() + "\r\n  ";
                             for (int Column = 0; Column < VoucherRow.Count(); Column++)
                             {
                                 IndividualVoucher = VoucherRow[Column];
                                 int CurrentPage = (int)Math.Ceiling(((decimal)IndividualVoucher.SequenceNumber) / 20);
-                                PrintRow += (Column == 3 ? " " : "") + String.Format("{0}/{1}/{2}", IndividualVoucher.BatchId, IndividualVoucher.SequenceNumber, PageCount).PadRight(30, ' ');
+                                PrintRow += FormatVoucherColumn(Column, printSettings.VoucherCpi, String.Format("{0}/{1}/{2}", IndividualVoucher.BatchId, IndividualVoucher.SequenceNumber, PageCount));
                             }
                             PrintRow = PrintRow.TrimEnd() + "\r\n  ";
                             for (int Column = 0; Column < VoucherRow.Count(); Column++)
                             {
                                 IndividualVoucher = VoucherRow[Column];
-                                PrintRow += (Column == 3 ? " " : "") + IndividualVoucher.Description.PadRight(30, ' ');
+                                PrintRow += FormatVoucherColumn(Column, printSettings.VoucherCpi, IndividualVoucher.Description);
                             }
                             PrintRow = PrintRow.TrimEnd() + "\r\n  ";
                             for (int Column = 0; Column < VoucherRow.Count(); Column++)
                             {
-                                PrintRow += (Column == 3 ? " " : "") + VendorId.PadRight(30, ' ');
+                                PrintRow += FormatVoucherColumn(Column, printSettings.VoucherCpi, VendorId);
                             }
 
                             PrintRow = PrintRow.TrimEnd() + "\r\n\n\n\n\n\n\n\n\n\n";
@@ -542,15 +642,12 @@ namespace BulkPrinting
                             VoucherCount = 0;
                             if (RowCount >= 4)
                             {
-                                //Globals.MaxPrinter.NewPage();
                                 PageCount++;
                                 RowCount = 0;
-                                //Globals.MaxPrinter.GetJobInfo(JobID);
                             }
                         }
                         TotalCount++;
                     }
-                    //Globals.MaxPrinter.Close();
                 }
             }
             Globals.MaxPrinter.Close();