Hide reset to default button on print settings form.

Prevent viewing of PINs for unprinted vouchers.

BulkPrinting/BulkPrinting/PrinterSettingsForm.Designer.cs

@@ -79,6 +79,7 @@
             this.resetButton.TabIndex = 5;
             this.resetButton.Text = "Reset to Default";
             this.resetButton.UseVisualStyleBackColor = false;
+            this.resetButton.Visible = false;
             this.resetButton.Click += new System.EventHandler(this.resetButton_Click);
             // 
             // okButton

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.12")]
+[assembly: AssemblyFileVersion("1.13")]

BulkPrinting/BulkPrinting/VoucherForm.Designer.cs

@@ -65,12 +65,12 @@
             this.dgvVouchers.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.dgvVouchers.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically;
             this.dgvVouchers.Location = new System.Drawing.Point(16, 133);
-            this.dgvVouchers.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.dgvVouchers.Margin = new System.Windows.Forms.Padding(4);
             this.dgvVouchers.MultiSelect = false;
             this.dgvVouchers.Name = "dgvVouchers";
             this.dgvVouchers.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
             this.dgvVouchers.Size = new System.Drawing.Size(939, 534);
-            this.dgvVouchers.TabIndex = 5;
+            this.dgvVouchers.TabIndex = 10;
             this.dgvVouchers.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvVouchers_CellContentClick);
             // 
             // lblBatchDetails
@@ -89,10 +89,10 @@
             this.rdoPrintDate.AutoSize = true;
             this.rdoPrintDate.ForeColor = System.Drawing.Color.White;
             this.rdoPrintDate.Location = new System.Drawing.Point(16, 49);
-            this.rdoPrintDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.rdoPrintDate.Margin = new System.Windows.Forms.Padding(4);
             this.rdoPrintDate.Name = "rdoPrintDate";
             this.rdoPrintDate.Size = new System.Drawing.Size(163, 21);
-            this.rdoPrintDate.TabIndex = 8;
+            this.rdoPrintDate.TabIndex = 0;
             this.rdoPrintDate.Text = "Date Printed (range):";
             this.rdoPrintDate.UseVisualStyleBackColor = true;
             this.rdoPrintDate.CheckedChanged += new System.EventHandler(this.rdoPrintDate_CheckedChanged);
@@ -102,10 +102,10 @@
             this.rdoVoucherRange.AutoSize = true;
             this.rdoVoucherRange.ForeColor = System.Drawing.Color.White;
             this.rdoVoucherRange.Location = new System.Drawing.Point(16, 78);
-            this.rdoVoucherRange.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.rdoVoucherRange.Margin = new System.Windows.Forms.Padding(4);
             this.rdoVoucherRange.Name = "rdoVoucherRange";
             this.rdoVoucherRange.Size = new System.Drawing.Size(207, 21);
-            this.rdoVoucherRange.TabIndex = 8;
+            this.rdoVoucherRange.TabIndex = 1;
             this.rdoVoucherRange.Text = "Vouchers in Selected Batch:";
             this.rdoVoucherRange.UseVisualStyleBackColor = true;
             this.rdoVoucherRange.CheckedChanged += new System.EventHandler(this.rdoVoucherRange_CheckedChanged);
@@ -116,10 +116,10 @@
             this.rdoSerialNum.Checked = true;
             this.rdoSerialNum.ForeColor = System.Drawing.Color.White;
             this.rdoSerialNum.Location = new System.Drawing.Point(16, 106);
-            this.rdoSerialNum.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.rdoSerialNum.Margin = new System.Windows.Forms.Padding(4);
             this.rdoSerialNum.Name = "rdoSerialNum";
             this.rdoSerialNum.Size = new System.Drawing.Size(123, 21);
-            this.rdoSerialNum.TabIndex = 8;
+            this.rdoSerialNum.TabIndex = 2;
             this.rdoSerialNum.TabStop = true;
             this.rdoSerialNum.Text = "Serial Number:";
             this.rdoSerialNum.UseVisualStyleBackColor = true;
@@ -133,7 +133,7 @@
             this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(159, 17);
-            this.label1.TabIndex = 9;
+            this.label1.TabIndex = 11;
             this.label1.Text = "Search for vouchers by:";
             this.label1.Click += new System.EventHandler(this.label1_Click);
             // 
@@ -141,29 +141,29 @@
             // 
             this.dtpStartDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
             this.dtpStartDate.Location = new System.Drawing.Point(471, 48);
-            this.dtpStartDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.dtpStartDate.Margin = new System.Windows.Forms.Padding(4);
             this.dtpStartDate.Name = "dtpStartDate";
             this.dtpStartDate.Size = new System.Drawing.Size(132, 22);
-            this.dtpStartDate.TabIndex = 10;
+            this.dtpStartDate.TabIndex = 3;
             this.dtpStartDate.ValueChanged += new System.EventHandler(this.dtpStartDate_ValueChanged);
             // 
             // dtpEndDate
             // 
             this.dtpEndDate.Format = System.Windows.Forms.DateTimePickerFormat.Short;
             this.dtpEndDate.Location = new System.Drawing.Point(680, 48);
-            this.dtpEndDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.dtpEndDate.Margin = new System.Windows.Forms.Padding(4);
             this.dtpEndDate.Name = "dtpEndDate";
             this.dtpEndDate.Size = new System.Drawing.Size(132, 22);
-            this.dtpEndDate.TabIndex = 10;
+            this.dtpEndDate.TabIndex = 4;
             this.dtpEndDate.ValueChanged += new System.EventHandler(this.dtpEndDate_ValueChanged);
             // 
             // txtSerial
             // 
             this.txtSerial.Location = new System.Drawing.Point(427, 105);
-            this.txtSerial.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txtSerial.Margin = new System.Windows.Forms.Padding(4);
             this.txtSerial.Name = "txtSerial";
             this.txtSerial.Size = new System.Drawing.Size(385, 22);
-            this.txtSerial.TabIndex = 11;
+            this.txtSerial.TabIndex = 8;
             // 
             // lblBatch1
             // 
@@ -173,7 +173,7 @@
             this.lblBatch1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lblBatch1.Name = "lblBatch1";
             this.lblBatch1.Size = new System.Drawing.Size(40, 17);
-            this.lblBatch1.TabIndex = 12;
+            this.lblBatch1.TabIndex = 15;
             this.lblBatch1.Text = "From";
             this.lblBatch1.Click += new System.EventHandler(this.lblBatch1_Click);
             // 
@@ -197,7 +197,7 @@
             this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(25, 17);
-            this.label4.TabIndex = 12;
+            this.label4.TabIndex = 13;
             this.label4.Text = "To";
             this.label4.Click += new System.EventHandler(this.label4_Click);
             // 
@@ -209,26 +209,26 @@
             this.lblBatch2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lblBatch2.Name = "lblBatch2";
             this.lblBatch2.Size = new System.Drawing.Size(25, 17);
-            this.lblBatch2.TabIndex = 12;
+            this.lblBatch2.TabIndex = 16;
             this.lblBatch2.Text = "To";
             this.lblBatch2.Click += new System.EventHandler(this.lblBatch2_Click);
             // 
             // numStartSeqNo
             // 
             this.numStartSeqNo.Location = new System.Drawing.Point(471, 76);
-            this.numStartSeqNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.numStartSeqNo.Margin = new System.Windows.Forms.Padding(4);
             this.numStartSeqNo.Name = "numStartSeqNo";
             this.numStartSeqNo.Size = new System.Drawing.Size(133, 22);
-            this.numStartSeqNo.TabIndex = 14;
+            this.numStartSeqNo.TabIndex = 6;
             this.numStartSeqNo.ValueChanged += new System.EventHandler(this.numStartSeqNo_ValueChanged);
             // 
             // numEndSeqNo
             // 
             this.numEndSeqNo.Location = new System.Drawing.Point(680, 76);
-            this.numEndSeqNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.numEndSeqNo.Margin = new System.Windows.Forms.Padding(4);
             this.numEndSeqNo.Name = "numEndSeqNo";
             this.numEndSeqNo.Size = new System.Drawing.Size(133, 22);
-            this.numEndSeqNo.TabIndex = 14;
+            this.numEndSeqNo.TabIndex = 7;
             this.numEndSeqNo.ValueChanged += new System.EventHandler(this.numEndSeqNo_ValueChanged);
             // 
             // btnSearch
@@ -238,20 +238,20 @@
             this.btnSearch.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
             this.btnSearch.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnSearch.Location = new System.Drawing.Point(821, 2);
-            this.btnSearch.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.btnSearch.Margin = new System.Windows.Forms.Padding(4);
             this.btnSearch.Name = "btnSearch";
             this.btnSearch.Size = new System.Drawing.Size(133, 123);
-            this.btnSearch.TabIndex = 13;
+            this.btnSearch.TabIndex = 9;
             this.btnSearch.UseVisualStyleBackColor = false;
             this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click);
             // 
             // numBatchId
             // 
             this.numBatchId.Location = new System.Drawing.Point(323, 76);
-            this.numBatchId.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.numBatchId.Margin = new System.Windows.Forms.Padding(4);
             this.numBatchId.Name = "numBatchId";
             this.numBatchId.Size = new System.Drawing.Size(92, 22);
-            this.numBatchId.TabIndex = 15;
+            this.numBatchId.TabIndex = 5;
             // 
             // label2
             // 
@@ -261,7 +261,7 @@
             this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(61, 17);
-            this.label2.TabIndex = 16;
+            this.label2.TabIndex = 14;
             this.label2.Text = "Batch ID";
             // 
             // VoucherForm
@@ -289,7 +289,7 @@
             this.Controls.Add(this.lblBatchDetails);
             this.Controls.Add(this.dgvVouchers);
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Margin = new System.Windows.Forms.Padding(4);
             this.MinimumSize = new System.Drawing.Size(822, 643);
             this.Name = "VoucherForm";
             this.Text = "View PINs";

BulkPrinting/BulkPrinting/VoucherForm.cs

@@ -56,7 +56,7 @@ namespace BulkPrinting
             {
                 if (rdoPrintDate.Checked)
                 {
-                    Command.CommandText = "SELECT v.BatchId, v.Serial, v.SequenceNumber, v.ExpiryDate, v.EncryptedPIN FROM Voucher v LEFT JOIN Logs l on v.Id = l.VoucherId and l.EventType=@eventtype WHERE l.EventDate BETWEEN @startdate AND @enddate";
+                    Command.CommandText = "SELECT v.BatchId, v.Serial, v.SequenceNumber, v.ExpiryDate, v.EncryptedPIN, v.PrintCount FROM Voucher v LEFT JOIN Logs l on v.Id = l.VoucherId and l.EventType=@eventtype WHERE l.EventDate BETWEEN @startdate AND @enddate";
                     Command.Parameters.AddWithValue("@eventtype", VendorEvent.VendorEventType.PrintVoucher);
                     CultureInfo IVC = CultureInfo.InvariantCulture;
                     Command.Parameters.AddWithValue("@startdate", dtpStartDate.Value.ToString("yyyy-MM-dd 00:00:00", IVC));
@@ -64,14 +64,14 @@ namespace BulkPrinting
                 }
                 else if (rdoVoucherRange.Checked)
                 {
-                    Command.CommandText = "SELECT BatchId, Serial, SequenceNumber, ExpiryDate, EncryptedPIN FROM Voucher WHERE BatchId = @batchid AND SequenceNumber BETWEEN @minseqno AND @maxseqno";
+                    Command.CommandText = "SELECT BatchId, Serial, SequenceNumber, ExpiryDate, EncryptedPIN, PrintCount FROM Voucher WHERE BatchId = @batchid AND SequenceNumber BETWEEN @minseqno AND @maxseqno";
                     Command.Parameters.AddWithValue("@batchid", numBatchId.Value);
                     Command.Parameters.AddWithValue("@minseqno", numStartSeqNo.Value);
                     Command.Parameters.AddWithValue("@maxseqno", numEndSeqNo.Value);
                 }
                 else if (rdoSerialNum.Checked)
                 {
-                    Command.CommandText = "SELECT BatchId, Serial, SequenceNumber, ExpiryDate, EncryptedPIN FROM Voucher WHERE Serial=@serial";
+                    Command.CommandText = "SELECT BatchId, Serial, SequenceNumber, ExpiryDate, EncryptedPIN, PrintCount FROM Voucher WHERE Serial=@serial";
                     Command.Parameters.AddWithValue("@serial", txtSerial.Text);
                 }
 
@@ -86,7 +86,15 @@ namespace BulkPrinting
                 {
                     while (SQLReader.Read())
                     {
-                        string VoucherPIN = Utility.TripleDESDecrypt(SQLReader.GetValue(4).ToString(), Globals.SessionVoucherKey).ToString();
+                        string VoucherPIN;
+                        if (SQLReader.GetInt32(5) > 0)
+                        {
+                            VoucherPIN = Utility.TripleDESDecrypt(SQLReader.GetValue(4).ToString(), Globals.SessionVoucherKey).ToString();
+                        }
+                        else
+                        {
+                            VoucherPIN = "NOT PRINTED";
+                        }
                         dgvVouchers.Rows.Add(new object[] {
                             SQLReader.GetValue(0),
                             SQLReader.GetValue(1),