From f8d65d05da7afc04aaef67b0105e58c22a461c20 Mon Sep 17 00:00:00 2001 From: edmondlang Date: Sat, 15 Jan 2022 13:39:17 +0800 Subject: [PATCH 1/6] notification-ui --- resources/views/partials/header.blade.php | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/resources/views/partials/header.blade.php b/resources/views/partials/header.blade.php index d3a15ad2..780d2c96 100644 --- a/resources/views/partials/header.blade.php +++ b/resources/views/partials/header.blade.php @@ -10,6 +10,29 @@ +
+
+ +
+
+
+
+ +
+
+
+

Your Parcel has arrived in the warehouse.

+

Hi user34234, your pracel has arrived the warehouse on 12-12-2021. Please click here to view more

+
+
+
+
+ View All Notifications +
+
+
+
+
From 4a2fb8e9e4104ac3048c6636b31f54262bcc8c43 Mon Sep 17 00:00:00 2001 From: edmondlang Date: Sat, 12 Mar 2022 17:10:38 +0800 Subject: [PATCH 2/6] update notification icon --- resources/views/partials/header.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/partials/header.blade.php b/resources/views/partials/header.blade.php index e4e045a4..f0a28c80 100644 --- a/resources/views/partials/header.blade.php +++ b/resources/views/partials/header.blade.php @@ -12,7 +12,7 @@
- +
From e2e8f69f90fecf682a611b0d50397f8d4e25b519 Mon Sep 17 00:00:00 2001 From: edmondlang Date: Tue, 15 Mar 2022 16:14:21 +0800 Subject: [PATCH 3/6] update notification add List Notifications API and UI --- .../General/Eloquent/Filters/TargetId.php | 21 +++++ .../ApproveIdentificationDocumentLogic.php | 19 ++++- .../ListNotificationsLogic.php | 61 ++++++++++++++ .../Services/ListsNotification.php | 33 ++++++++ .../ListNotificationsController.php | 19 +++++ app/Http/Resources/NotificationResource.php | 30 +++++++ .../assets/sass/modules/_typography.scss | 6 ++ .../IdentificationVerificationComponent.vue | 23 +----- ...dentificationVerificationFormComponent.vue | 82 +++++++++++++++++++ ...CustomerProfileDetailsSectionComponent.vue | 2 - .../elements/NotificationSectionComponent.vue | 66 +++++++++++++++ resources/views/partials/header.blade.php | 22 +---- routes/web.php | 4 +- 13 files changed, 341 insertions(+), 47 deletions(-) create mode 100644 app/Classes/General/Eloquent/Filters/TargetId.php create mode 100644 app/Classes/Modules/Notifications/ControllersLogic/ListNotificationsLogic.php create mode 100644 app/Classes/Modules/Notifications/Services/ListsNotification.php create mode 100644 app/Http/Controllers/Notifications/ListNotificationsController.php create mode 100644 app/Http/Resources/NotificationResource.php create mode 100644 resources/assets/vue/components/companies/forms/RejectIdentificationVerificationFormComponent.vue create mode 100644 resources/assets/vue/components/general/elements/NotificationSectionComponent.vue diff --git a/app/Classes/General/Eloquent/Filters/TargetId.php b/app/Classes/General/Eloquent/Filters/TargetId.php new file mode 100644 index 00000000..2bd7045e --- /dev/null +++ b/app/Classes/General/Eloquent/Filters/TargetId.php @@ -0,0 +1,21 @@ +where('target_type', User::class)->where('target_id', $value); + } + +} \ No newline at end of file diff --git a/app/Classes/Modules/Companies/ControllersLogic/ApproveIdentificationDocumentLogic.php b/app/Classes/Modules/Companies/ControllersLogic/ApproveIdentificationDocumentLogic.php index 0d3f007a..af42a35a 100644 --- a/app/Classes/Modules/Companies/ControllersLogic/ApproveIdentificationDocumentLogic.php +++ b/app/Classes/Modules/Companies/ControllersLogic/ApproveIdentificationDocumentLogic.php @@ -14,6 +14,8 @@ use App\Classes\General\Abstracts\AbstractControllerLogic; use App\Classes\Modules\Documents\Services\FetchesDocument; use App\Classes\Modules\Documents\Services\ApprovesDocument; +use App\Classes\Modules\Notifications\DataTransferObjects\NotificationObject; +Use App\Classes\Modules\Notifications\Processors\CreateNotificationProcessor; use App\Models\Document; use Illuminate\Http\JsonResponse; @@ -50,6 +52,9 @@ class ApproveIdentificationDocumentLogic extends AbstractControllerLogic /** @var UpdatesOrdersStatus */ private $updatesOrdersStatus; + /** @var CreateNotificationProcessor */ + private $createNotificationProcessor; + /** * ApproveIdentificationDocumentLogic constructor. * @param CanApproveDocument $canApproveDocument @@ -58,8 +63,9 @@ class ApproveIdentificationDocumentLogic extends AbstractControllerLogic * @param FetchesDocument $fetchesDocument * @param UpdatesCompanyStatus $updatesCompanyStatus * @param UpdatesOrdersStatus $updatesOrdersStatus + * @param CreateNotificationProcessor $createNotificationProcessor */ - public function __construct(CanApproveDocument $canApproveDocument, ApprovesDocument $approvesDocument, RejectsDocument $rejectsDocument, FetchesDocument $fetchesDocument, UpdatesCompanyStatus $updatesCompanyStatus, UpdatesOrdersStatus $updatesOrdersStatus) + public function __construct(CanApproveDocument $canApproveDocument, ApprovesDocument $approvesDocument, RejectsDocument $rejectsDocument, FetchesDocument $fetchesDocument, UpdatesCompanyStatus $updatesCompanyStatus, UpdatesOrdersStatus $updatesOrdersStatus, CreateNotificationProcessor $createNotificationProcessor) { $this->canApproveDocument = $canApproveDocument; $this->approvesDocument = $approvesDocument; @@ -67,6 +73,7 @@ class ApproveIdentificationDocumentLogic extends AbstractControllerLogic $this->fetchesDocument = $fetchesDocument; $this->updatesCompanyStatus = $updatesCompanyStatus; $this->updatesOrdersStatus = $updatesOrdersStatus; + $this->createNotificationProcessor = $createNotificationProcessor; } /** @@ -90,6 +97,16 @@ class ApproveIdentificationDocumentLogic extends AbstractControllerLogic $this->updatesCompanyStatus->execute($document->owner, $status === 'approve' ? ApprovalStatus::APPROVED : ApprovalStatus::REJECTED); + $object = new NotificationObject( + 'ID Verification ' . ( $status === 'approve' ? 'Approved' : 'Rejected' ), + ( $status === 'approve' ? 'Dear user, congratulations that your ' : 'Dear user, we are sorry to inform you that your ' ) . ( $document->type === 'IDENTITY_CARD' ? 'IC' : 'SSM' ) . ( $status === 'approve' ? ' has been approved. Start your first order now!' : ' has been rejected due to ' . ( $request->input('rejectRemark') ?? '' ) . ', please resubmit it for further action.' ), + $document->owner, + $document->owner->companyModules()->first()->employees()->first(), + $document, + ); + + $this->createNotificationProcessor->execute($object); + if($status === 'approve'){ $orders = $this->updatesOrdersStatus->execute($document->owner, ApprovalStatus::APPROVED); } diff --git a/app/Classes/Modules/Notifications/ControllersLogic/ListNotificationsLogic.php b/app/Classes/Modules/Notifications/ControllersLogic/ListNotificationsLogic.php new file mode 100644 index 00000000..0fdbf6f9 --- /dev/null +++ b/app/Classes/Modules/Notifications/ControllersLogic/ListNotificationsLogic.php @@ -0,0 +1,61 @@ + 'Retrieve Notifications', + 'message' => 'You have successfully retrieved a list of Notifications' + ]; + } + + /** @var ListsNotification */ + private $listsNotification; + + /** + * ListNotificationsLogic constructor. + * @param ListsNotification $listsNotification + */ + public function __construct( + ListsNotification $listsNotification + ) + { + $this->listsNotification = $listsNotification; + } + + + /** + * @param Request $request + * @return JsonResponse + * @throws \App\Classes\Exceptions\AccessForbiddenException + * @throws \App\Classes\Exceptions\MalformedRequestException + * @throws \App\Classes\Exceptions\RequestValidationException + */ + public function logic(Request $request) : JsonResponse + { + + $filters = [ + // 'target_id'=>auth()->user()->id, + // 'per_page'=>$request->route('per_page') + ]; + + $notifications = $this->listsNotification->execute($filters); + + return $this->collectionResponse(NotificationResource::collection($notifications)); + + } + +} \ No newline at end of file diff --git a/app/Classes/Modules/Notifications/Services/ListsNotification.php b/app/Classes/Modules/Notifications/Services/ListsNotification.php new file mode 100644 index 00000000..707e7ae8 --- /dev/null +++ b/app/Classes/Modules/Notifications/Services/ListsNotification.php @@ -0,0 +1,33 @@ +repository = $repository; + } + + + /** + * @return Builder + */ + function getRepository(): Builder + { + return $this->repository->newQuery(); + } +} \ No newline at end of file diff --git a/app/Http/Controllers/Notifications/ListNotificationsController.php b/app/Http/Controllers/Notifications/ListNotificationsController.php new file mode 100644 index 00000000..58455fc2 --- /dev/null +++ b/app/Http/Controllers/Notifications/ListNotificationsController.php @@ -0,0 +1,19 @@ +execute($request); + } +} \ No newline at end of file diff --git a/app/Http/Resources/NotificationResource.php b/app/Http/Resources/NotificationResource.php new file mode 100644 index 00000000..564b7b31 --- /dev/null +++ b/app/Http/Resources/NotificationResource.php @@ -0,0 +1,30 @@ + $this->id, + 'title' => $this->title, + 'description' => $this->description, + 'long_ago' => $this->created_at->diffForHumans(), + 'created_at' => $this->created_at->format('d-m-Y') + ]; + + } +} diff --git a/resources/assets/sass/modules/_typography.scss b/resources/assets/sass/modules/_typography.scss index a22dc2fc..60817d2a 100644 --- a/resources/assets/sass/modules/_typography.scss +++ b/resources/assets/sass/modules/_typography.scss @@ -317,6 +317,12 @@ hr{ background-color: $color-primary-lighter !important; } +.bg-primary-lighter-hover { + &:hover { + background-color: $color-primary-lighter !important; + } +} + /* Complete ------------------------------------ */ diff --git a/resources/assets/vue/components/companies/elements/IdentificationVerificationComponent.vue b/resources/assets/vue/components/companies/elements/IdentificationVerificationComponent.vue index 29edf834..7a9fe7a8 100644 --- a/resources/assets/vue/components/companies/elements/IdentificationVerificationComponent.vue +++ b/resources/assets/vue/components/companies/elements/IdentificationVerificationComponent.vue @@ -137,28 +137,7 @@
-
-
-
-
-
-
-
Reject Document
-
Are you sure you want to reject this customer's identification?
-
-
-
-
-
Cancel
-
-
-
Reject
-
-
-
-
-
-
+
diff --git a/resources/assets/vue/components/general/elements/NotificationSectionComponent.vue b/resources/assets/vue/components/general/elements/NotificationSectionComponent.vue new file mode 100644 index 00000000..f152607b --- /dev/null +++ b/resources/assets/vue/components/general/elements/NotificationSectionComponent.vue @@ -0,0 +1,66 @@ + + \ No newline at end of file diff --git a/resources/views/partials/header.blade.php b/resources/views/partials/header.blade.php index f0a28c80..44f1b874 100644 --- a/resources/views/partials/header.blade.php +++ b/resources/views/partials/header.blade.php @@ -11,27 +11,7 @@
-
- -
-
-
-
- -
-
-
-

Your Parcel has arrived in the warehouse.

-

Hi user34234, your pracel has arrived the warehouse on 12-12-2021. Please click here to view more

-
-
-
-
- View All Notifications -
-
-
-
+
diff --git a/routes/web.php b/routes/web.php index bb35d287..b4713d62 100644 --- a/routes/web.php +++ b/routes/web.php @@ -273,4 +273,6 @@ Route::get('/customers/active/{active_start}/{active_end}/{inactive_start?}/{ina }); -Route::get('/online_payment/redirect', 'Billplz\CallbackBillplzController@callback')->name('online_payment.redirect'); \ No newline at end of file +Route::get('/online_payment/redirect', 'Billplz\CallbackBillplzController@callback')->name('online_payment.redirect'); + +Route::get('/notifications/list', 'Notifications\ListNotificationsController@list')->name('notifications.list'); From 6e9a27024b4e3dad9b6e22b3f2e2aa806e8c7de6 Mon Sep 17 00:00:00 2001 From: edmondlang Date: Sat, 16 Apr 2022 16:19:25 +0800 Subject: [PATCH 4/6] update notification ui --- .../elements/NotificationSectionComponent.vue | 51 +++++++++++-------- 1 file changed, 30 insertions(+), 21 deletions(-) diff --git a/resources/assets/vue/components/general/elements/NotificationSectionComponent.vue b/resources/assets/vue/components/general/elements/NotificationSectionComponent.vue index f152607b..336c447a 100644 --- a/resources/assets/vue/components/general/elements/NotificationSectionComponent.vue +++ b/resources/assets/vue/components/general/elements/NotificationSectionComponent.vue @@ -3,32 +3,41 @@
-
- -
+
+
-
-
-
- -
+
+
+

Notification Center

-
-

{{ notification.title }}

-

{{ notification.description }}

-

{{ notification.long_ago }}

-
-
-
- +
+ +
+
+
+
+
+ +
+
+
+

{{ notification.title }}

+

{{ notification.description }}

+

{{ notification.long_ago }}

+
+
+
+ +
+
-
-
-
-
- View All Notifications +
+
+ View All Notifications +
+
From 5a723c5fd17bee3341fd8d5a33d5f1986951f27a Mon Sep 17 00:00:00 2001 From: edmondlang Date: Sat, 16 Apr 2022 23:54:51 +0800 Subject: [PATCH 5/6] update notification ui - solve ui bug when only have 1 notification --- .../general/elements/NotificationSectionComponent.vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/resources/assets/vue/components/general/elements/NotificationSectionComponent.vue b/resources/assets/vue/components/general/elements/NotificationSectionComponent.vue index 336c447a..1304ceba 100644 --- a/resources/assets/vue/components/general/elements/NotificationSectionComponent.vue +++ b/resources/assets/vue/components/general/elements/NotificationSectionComponent.vue @@ -3,7 +3,7 @@
-
+
@@ -12,7 +12,7 @@
-
+
@@ -54,6 +54,7 @@ error: '', notifications: null, isClicked: false, + notificationsLength: 0, } }, methods: { @@ -68,6 +69,7 @@ successHandler(response){ this.isLoading = false; this.notifications = response.payload.data; + this.notificationsLength = response.payload.data.length; }, }, mixins: [ModalFormHandler] From b3a296f2eb94e64bb3d627e25f988bc081d49cf2 Mon Sep 17 00:00:00 2001 From: edmondlang Date: Sun, 17 Apr 2022 21:10:52 +0800 Subject: [PATCH 6/6] update notification ui, display no result found if no notification --- .../elements/NotificationSectionComponent.vue | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/resources/assets/vue/components/general/elements/NotificationSectionComponent.vue b/resources/assets/vue/components/general/elements/NotificationSectionComponent.vue index 1304ceba..e0f6fb1c 100644 --- a/resources/assets/vue/components/general/elements/NotificationSectionComponent.vue +++ b/resources/assets/vue/components/general/elements/NotificationSectionComponent.vue @@ -33,6 +33,27 @@
+
+
+
+
+
+
+
+
+
+

Nothing To Show Here

+
+
+
+
+ There is no results found. +
+
+
+
+
+
View All Notifications