Update vendors
Fix js click
Removed phone number order
Fixed btn shipment
Merge
Merge branch 'master' into dev