diff --git a/.gitignore b/.gitignore index e0d3f9c..f11b352 100755 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ Homestead.yaml /resources/views/vendor /storage/api-docs /public/swagger-ui-assets +/public/documents diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index bb257cc..d91c4bb 100755 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -12,6 +12,7 @@ use App\Traits\Helper; use Illuminate\Http\Request; use Illuminate\Http\Response; use Illuminate\Support\Facades\File; +use Illuminate\Support\Str; class UserController extends Controller { @@ -85,9 +86,9 @@ class UserController extends Controller } // dd($request->all()); $this->validate($request, [ - 'document_image_front' => 'required|image|mimes:jpeg,png,jpg,gif,svg|max:6048', - 'document_image_back' => 'required|image|mimes:jpeg,png,jpg,gif,svg|max:6048', - 'user_image' => 'required|image|mimes:jpeg,png,jpg,gif,svg|max:6048', + 'document_image_front' => 'required|image|mimes:jpeg,png,jpg,gif,svg|max:6144', + 'document_image_back' => 'required|image|mimes:jpeg,png,jpg,gif,svg|max:6144', + 'user_image' => 'required|image|mimes:jpeg,png,jpg,gif,svg|max:6144', ]); $identification->document_image_front = $this->uploadImage($request, 'document_image_front', 'D-F', "documents"); @@ -171,7 +172,7 @@ class UserController extends Controller $original_filename = $request->file($key)->getClientOriginalName(); $original_filename_arr = explode('.', $original_filename); $file_ext = end($original_filename_arr); - $image = $imageCode . '-' . time() . '.' . $file_ext; + $image = $imageCode . '-' . Str::uuid() . '.' . $file_ext; //Check if the directory already exists. $directoryName = './' . $folderName; diff --git a/app/Http/Controllers/UserGroupController.php b/app/Http/Controllers/UserGroupController.php index 40daeb8..9e46e46 100755 --- a/app/Http/Controllers/UserGroupController.php +++ b/app/Http/Controllers/UserGroupController.php @@ -164,7 +164,7 @@ class UserGroupController extends Controller if ($group->actif) return $this->errorResponse(trans('errors.group_already_active')); - $datetime = $this->getCurrentTimeByCountryCode($sponsor->network->country->code_country);; + $datetime = $this->getCurrentTimeByCountryCode($sponsor->network->country->code_country); ++$group->nombre_validation; ++$group->nombre_utilisateurs; @@ -183,7 +183,7 @@ class UserGroupController extends Controller // Notififier le createur $data = new \stdClass(); $data->screen = "notificationview"; - $data->data = new \stdClass();; + $data->data = new \stdClass(); $data->data->id = $request->id_demande; $this->sendPushNotificationToUser($group->createur->user_code, trans('notifications.accepted_group_validation_request', ['name' => $sponsor->lastname . ' ' . $sponsor->firstname]), $data, $demande->date_validation); @@ -216,7 +216,7 @@ class UserGroupController extends Controller // Notififier le createur $data = new \stdClass(); $data->screen = "notificationview"; - $data->data = new \stdClass();; + $data->data = new \stdClass(); $data->data->id = $request->id_demande; if ($demande->type == 'creation') { @@ -248,6 +248,8 @@ class UserGroupController extends Controller return $this->successResponse(trans('messages.successful_canceled_nano_credit_request')); } + return $this->errorResponse(trans('errors.unexpected_error')); + } public function updateGroup(Request $request) @@ -473,7 +475,7 @@ ug.date_creation as date_creation_groupe , ug.createur , ug.sponsor1 , ug.sponso // Notififier l'utilisateur $data = new \stdClass(); $data->screen = "notificationview"; - $data->data = new \stdClass();; + $data->data = new \stdClass(); $data->data->id = $request->id_demande; $this->sendPushNotificationToUser($user->user_code, trans('notifications.accepted_group_membership_request', ['name' => $sponsor->lastname . ' ' . $sponsor->firstname]), $data, $demande->date_validation); @@ -532,7 +534,7 @@ ug.date_creation as date_creation_groupe , ug.createur , ug.sponsor1 , ug.sponso // Notififier le createur $data = new \stdClass(); $data->screen = "notificationview"; - $data->data = new \stdClass();; + $data->data = new \stdClass(); $data->data->id = $request->id_demande; $this->sendPushNotificationToUser($group->createur->user_code, trans('notifications.accepted_group_deleting_request', ['name' => $sponsor->lastname . ' ' . $sponsor->firstname]), $data, $demande->date_validation); @@ -616,7 +618,7 @@ ug.date_creation , ug.createur , ug.sponsor1 , ug.sponsor2 , ug.sponsor3, ug.cou // Notififier l'utilisateur $data = new \stdClass(); $data->screen = "notificationview"; - $data->data = new \stdClass();; + $data->data = new \stdClass(); $data->data->id = $request->id_demande; $this->sendPushNotificationToUser($user->user_code, trans('notifications.accepted_group_nano_credit_request'), $data, $demande->date_validation); diff --git a/app/Models/Identification.php b/app/Models/Identification.php index 622af15..e0aa24a 100644 --- a/app/Models/Identification.php +++ b/app/Models/Identification.php @@ -16,6 +16,7 @@ use Illuminate\Database\Eloquent\Model; * @property string $firstname * @property string $lastname * @property Carbon $birth_date + * @property string $gender * @property string $town * @property string $country * @property string $identity_document @@ -54,19 +55,20 @@ class Identification extends Model ]; protected $fillable = [ - 'firstname', - 'lastname', - 'birth_date', - 'town', - 'country', - 'identity_document', - 'id_identity_document', - 'expiry_date_document', - 'id_user', - 'status', - 'createdAt', - 'user_image', - 'document_image_front', + 'firstname', + 'lastname', + 'birth_date', + 'gender', + 'town', + 'country', + 'identity_document', + 'id_identity_document', + 'expiry_date_document', + 'id_user', + 'status', + 'createdAt', + 'user_image', + 'document_image_front', 'document_image_back', 'idNetwork', 'country_id' @@ -90,13 +92,14 @@ class Identification extends Model public function rules() { return [ - 'lastname'=>'required', - 'birth_date'=> 'required|date|before_or_equal:today', - 'town'=>'required', - 'country'=> 'required', - 'identity_document'=> 'required', - 'id_identity_document'=> 'required', - 'expiry_date_document'=>'required|date|after_or_equal:today', + 'lastname' => 'required', + 'birth_date' => 'required|date|before_or_equal:today', + 'gender' => 'required|in:M,F', + 'town' => 'required', + 'country' => 'required', + 'identity_document' => 'required', + 'id_identity_document' => 'required', + 'expiry_date_document' => 'required|date|after_or_equal:today', 'id_user' => 'required_without_all:phone_number|integer|min:0|not_in:0', 'phone_number' => 'required_without_all:id_user' ]; diff --git a/database/migrations/2021_11_02_160624_add_gender_in_identifications_table.php b/database/migrations/2021_11_02_160624_add_gender_in_identifications_table.php new file mode 100644 index 0000000..fd9bbf4 --- /dev/null +++ b/database/migrations/2021_11_02_160624_add_gender_in_identifications_table.php @@ -0,0 +1,32 @@ +enum('gender', ['M', 'F'])->default('M')->after('birth_date'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('identifications', function (Blueprint $table) { + $table->dropColumn('gender'); + }); + } +}