@ -75,10 +75,9 @@ class Controller extends BaseController
*/
protected function getMerchantId()
{
$user = UserService::getCurrentLoginUser(true);
if (!empty($user)) {
/* if (!empty($user)) {
$this->merchantId = $user['user_name'];
}
}*/
/**