Regression: BillItemKey added the compare methods back
Regression: PrintLocation added the compare methods back Breaking: Kot.Code is now integers Breaking: Kot Update is now via Stored Procedure to get DB Values Breaking: Reprints Insert is now via Stored Procedure to get DV Values Breaking: Voucher.BillID and KotID are now integers Breaking: Voucher Insert/Update is now via Stored Procedures to get DV Values also Dirty Checking for Voucher has been overwritten to set dirty for LastEditDate update Fix: Login forms simplified Feature: PrintLocation and Products are cached application wide.
This commit is contained in:
@ -36,8 +36,8 @@
|
||||
this.label3 = new System.Windows.Forms.Label();
|
||||
this.txtConfirmPassword = new System.Windows.Forms.TextBox();
|
||||
this.label4 = new System.Windows.Forms.Label();
|
||||
this.button2 = new System.Windows.Forms.Button();
|
||||
this.btnCreateUSer = new System.Windows.Forms.Button();
|
||||
this.btnCancel = new System.Windows.Forms.Button();
|
||||
this.btnChangePassword = new System.Windows.Forms.Button();
|
||||
this.btnMsr = new System.Windows.Forms.Button();
|
||||
this.SuspendLayout();
|
||||
//
|
||||
@ -113,25 +113,25 @@
|
||||
this.label4.Text = "Confirm Password";
|
||||
this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
|
||||
//
|
||||
// button2
|
||||
// btnCancel
|
||||
//
|
||||
this.button2.Location = new System.Drawing.Point(211, 116);
|
||||
this.button2.Name = "button2";
|
||||
this.button2.Size = new System.Drawing.Size(55, 23);
|
||||
this.button2.TabIndex = 5;
|
||||
this.button2.Text = "Ca&ncel";
|
||||
this.button2.UseVisualStyleBackColor = true;
|
||||
this.button2.Click += new System.EventHandler(this.button2_Click);
|
||||
this.btnCancel.Location = new System.Drawing.Point(211, 116);
|
||||
this.btnCancel.Name = "btnCancel";
|
||||
this.btnCancel.Size = new System.Drawing.Size(55, 23);
|
||||
this.btnCancel.TabIndex = 5;
|
||||
this.btnCancel.Text = "Ca&ncel";
|
||||
this.btnCancel.UseVisualStyleBackColor = true;
|
||||
this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
|
||||
//
|
||||
// btnCreateUSer
|
||||
// btnChangePassword
|
||||
//
|
||||
this.btnCreateUSer.Location = new System.Drawing.Point(84, 116);
|
||||
this.btnCreateUSer.Name = "btnCreateUSer";
|
||||
this.btnCreateUSer.Size = new System.Drawing.Size(121, 23);
|
||||
this.btnCreateUSer.TabIndex = 4;
|
||||
this.btnCreateUSer.Text = "&Change Password";
|
||||
this.btnCreateUSer.UseVisualStyleBackColor = true;
|
||||
this.btnCreateUSer.Click += new System.EventHandler(this.btnCreateUSer_Click);
|
||||
this.btnChangePassword.Location = new System.Drawing.Point(84, 116);
|
||||
this.btnChangePassword.Name = "btnChangePassword";
|
||||
this.btnChangePassword.Size = new System.Drawing.Size(121, 23);
|
||||
this.btnChangePassword.TabIndex = 4;
|
||||
this.btnChangePassword.Text = "&Change Password";
|
||||
this.btnChangePassword.UseVisualStyleBackColor = true;
|
||||
this.btnChangePassword.Click += new System.EventHandler(this.btnChangePassword_Click);
|
||||
//
|
||||
// btnMsr
|
||||
//
|
||||
@ -149,8 +149,8 @@
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||
this.ClientSize = new System.Drawing.Size(287, 185);
|
||||
this.Controls.Add(this.btnMsr);
|
||||
this.Controls.Add(this.button2);
|
||||
this.Controls.Add(this.btnCreateUSer);
|
||||
this.Controls.Add(this.btnCancel);
|
||||
this.Controls.Add(this.btnChangePassword);
|
||||
this.Controls.Add(this.txtConfirmPassword);
|
||||
this.Controls.Add(this.label4);
|
||||
this.Controls.Add(this.txtnewPassword);
|
||||
@ -179,8 +179,8 @@
|
||||
private System.Windows.Forms.Label label3;
|
||||
private System.Windows.Forms.TextBox txtConfirmPassword;
|
||||
private System.Windows.Forms.Label label4;
|
||||
private System.Windows.Forms.Button button2;
|
||||
private System.Windows.Forms.Button btnCreateUSer;
|
||||
private System.Windows.Forms.Button btnCancel;
|
||||
private System.Windows.Forms.Button btnChangePassword;
|
||||
private System.Windows.Forms.Button btnMsr;
|
||||
}
|
||||
}
|
||||
@ -32,12 +32,12 @@ namespace Tanshu.Accounts.PointOfSale
|
||||
txtUsername.Text = Session.User.Name;
|
||||
}
|
||||
|
||||
private void button2_Click(object sender, EventArgs e)
|
||||
private void btnCancel_Click(object sender, EventArgs e)
|
||||
{
|
||||
this.Close();
|
||||
}
|
||||
|
||||
private void btnCreateUSer_Click(object sender, EventArgs e)
|
||||
private void btnChangePassword_Click(object sender, EventArgs e)
|
||||
{
|
||||
if (txtPassword.Text.Trim() == "")
|
||||
MessageBox.Show("Old password can not be blank", "Blank not allowed");
|
||||
@ -53,7 +53,6 @@ namespace Tanshu.Accounts.PointOfSale
|
||||
{
|
||||
if (ChangeUserPassword())
|
||||
{
|
||||
MessageBox.Show("Password changed", "Confirm");
|
||||
this.Close();
|
||||
}
|
||||
else
|
||||
@ -65,43 +64,38 @@ namespace Tanshu.Accounts.PointOfSale
|
||||
|
||||
private bool ChangeUserPassword()
|
||||
{
|
||||
var userEntity = new User();
|
||||
userEntity.Name = txtUsername.Text.Trim();
|
||||
userEntity.Password = Tanshu.Common.Md5.Hash(txtPassword.Text.Trim(), "v2");
|
||||
|
||||
using (var bi = new UserBI())
|
||||
if (bi.ValidateUser(userEntity.Name, userEntity.Password) != null)
|
||||
return bi.ChangePassword(userEntity, Tanshu.Common.Md5.Hash(txtnewPassword.Text.Trim(), "v2"));
|
||||
else
|
||||
{
|
||||
var user = bi.ValidateUser(Session.User.Name, txtPassword.Text.Trim());
|
||||
if (user == null)
|
||||
return false;
|
||||
bi.ChangePassword(user, txtnewPassword.Text.Trim());
|
||||
bi.SaveChanges();
|
||||
MessageBox.Show("Password changed", "Confirm");
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
private void btnMsr_Click(object sender, EventArgs e)
|
||||
{
|
||||
var user = new User();
|
||||
user.Name = txtUsername.Text.Trim();
|
||||
user.Password = Common.Md5.Hash(txtPassword.Text.Trim(), "v2");
|
||||
|
||||
using (var bi = new UserBI())
|
||||
if (bi.ValidateUser(user.Name, user.Password) == null)
|
||||
return;
|
||||
using (var frm = new MsrLoginForm(true))
|
||||
{
|
||||
frm.ShowDialog();
|
||||
string userName;
|
||||
frm.UserName(out userName);
|
||||
if (MessageBox.Show("Update Msr Card", "Update", MessageBoxButtons.YesNo, MessageBoxIcon.Question) !=
|
||||
DialogResult.Yes)
|
||||
var user = bi.ValidateUser(Session.User.Name, txtPassword.Text.Trim());
|
||||
if (user == null)
|
||||
return;
|
||||
using (var bi = new UserBI())
|
||||
using (var frm = new MsrLoginForm(true))
|
||||
{
|
||||
user = bi.Get(x => x.Name == user.Name);
|
||||
user.MsrString = userName;
|
||||
frm.ShowDialog();
|
||||
var msrString = frm.User().MsrString;
|
||||
if (MessageBox.Show("Update Msr Card", "Update", MessageBoxButtons.YesNo, MessageBoxIcon.Question) !=
|
||||
DialogResult.Yes)
|
||||
return;
|
||||
user.MsrString = msrString;
|
||||
bi.Update(user);
|
||||
bi.SaveChanges();
|
||||
MessageBox.Show("Msr Card Updated");
|
||||
this.Close();
|
||||
}
|
||||
MessageBox.Show("Msr Card Updated");
|
||||
this.Close();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user