T3 mahmoud walid 3.2

@samehmetias  @AmrEmara  @mshebokshy  @mostafa-adel 
updated validations in items