From f8d65d05da7afc04aaef67b0105e58c22a461c20 Mon Sep 17 00:00:00 2001 From: edmondlang Date: Sat, 15 Jan 2022 13:39:17 +0800 Subject: [PATCH 01/67] 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 02/67] 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 03/67] 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 3a2146146c26a9702804a0ce134a6dc875024833 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 5 Apr 2022 13:20:52 +0800 Subject: [PATCH 04/67] add crisp --- resources/views/vendor/js.blade.php | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/resources/views/vendor/js.blade.php b/resources/views/vendor/js.blade.php index 2e3eb60c..e8472398 100644 --- a/resources/views/vendor/js.blade.php +++ b/resources/views/vendor/js.blade.php @@ -7,17 +7,10 @@ ]) !!}; @if(!App::environment('production')) - + @endif From 0ec922622649010f10b19ff50a2f09a0e0cb2190 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 5 Apr 2022 13:26:24 +0800 Subject: [PATCH 05/67] add crisp --- resources/views/vendor/js.blade.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/resources/views/vendor/js.blade.php b/resources/views/vendor/js.blade.php index e8472398..be5a8e86 100644 --- a/resources/views/vendor/js.blade.php +++ b/resources/views/vendor/js.blade.php @@ -7,10 +7,8 @@ ]) !!}; @if(!App::environment('production')) - + + @endif From 5aa93b30c768d6da1aaf258e19f6dfa3108a7fd8 Mon Sep 17 00:00:00 2001 From: edmondlang Date: Tue, 5 Apr 2022 19:05:57 +0800 Subject: [PATCH 06/67] update container select packing list --- .../forms/ListPackagelistFormComponent.vue | 18 ++++++++++++++---- .../ContainerProfileSectionComponent.vue | 2 +- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/resources/assets/vue/components/containers/forms/ListPackagelistFormComponent.vue b/resources/assets/vue/components/containers/forms/ListPackagelistFormComponent.vue index 6882b482..5f33bb61 100644 --- a/resources/assets/vue/components/containers/forms/ListPackagelistFormComponent.vue +++ b/resources/assets/vue/components/containers/forms/ListPackagelistFormComponent.vue @@ -28,10 +28,11 @@ \ No newline at end of file diff --git a/routes/web.php b/routes/web.php index 8ba22313..732ac78d 100644 --- a/routes/web.php +++ b/routes/web.php @@ -240,6 +240,8 @@ Route::get('/settings', function () { return view('pages.settings'); })->name('settings'); +Route::get('/customer/{company_module_id}/summary', 'Exports\ExportCompanyModuleSummaryController@export')->name('customer.summary.export'); + Route::get('/customer/summary/monthly', function () { // $containers = Container::whereMonth('loading_date', 1)->where('owner_id', 3)->get(); $containers = Container::whereIn('reference', ['EPS-3850', 'EPS-3863', 'WP-1331', 'EPS-3856'])->get(); From 715635954a942223765ef946a4e7aa11c1c1904b Mon Sep 17 00:00:00 2001 From: edmondlang Date: Thu, 7 Apr 2022 12:30:39 +0800 Subject: [PATCH 08/67] update file name --- .../Exports/ExportCompanyModuleSummaryController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Exports/ExportCompanyModuleSummaryController.php b/app/Http/Controllers/Exports/ExportCompanyModuleSummaryController.php index 696cd86f..17ee64d8 100644 --- a/app/Http/Controllers/Exports/ExportCompanyModuleSummaryController.php +++ b/app/Http/Controllers/Exports/ExportCompanyModuleSummaryController.php @@ -23,7 +23,7 @@ class ExportCompanyModuleSummaryController public function export(Request $request) { $exportsCompanyModuleSummary = new ExportsCompanyModuleSummary($request); $exportsCompanyModuleSummary->setParameters($request->route('company_module_id'), $request->input('containerNumber')); - $response = $exportsCompanyModuleSummary->download('customer-report-by-containers.xls', Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']); + $response = $exportsCompanyModuleSummary->download('customerid-markingno.xls', Excel::XLS, ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']); ob_end_clean(); return $response; } From d30dab61eafb816a21090d9d9ff08ab7108af9e5 Mon Sep 17 00:00:00 2001 From: edmondlang Date: Thu, 7 Apr 2022 23:45:36 +0800 Subject: [PATCH 09/67] intergrate api for decalreing postcode area --- .../DeclarePostcodeAreaFormComponent.vue | 22 +++++++++---------- .../elements/ListPostcodeComponent.vue | 2 +- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/resources/assets/vue/components/containers/forms/DeclarePostcodeAreaFormComponent.vue b/resources/assets/vue/components/containers/forms/DeclarePostcodeAreaFormComponent.vue index 506d6472..e04d8e5b 100644 --- a/resources/assets/vue/components/containers/forms/DeclarePostcodeAreaFormComponent.vue +++ b/resources/assets/vue/components/containers/forms/DeclarePostcodeAreaFormComponent.vue @@ -4,24 +4,24 @@

{{data}}

-

This postcode is yet to be declare. Plase choose the area.

+

This postcode is yet to be declare. Plase choose the area.

-
+
-
City Center
+
City Center
-
+
-
Outskirt
+
Outskirt
@@ -32,8 +32,7 @@
Cancel
- -
Confirm
+
Confirm
@@ -55,13 +54,12 @@ }, data() { return { - postcodeArea: '', + parameters: { + reference: '', + postcode: this.data + } }; }, - validations: { - orderNo: '', - - }, mixins: [modalFormHandler] } diff --git a/resources/assets/vue/components/settings/elements/ListPostcodeComponent.vue b/resources/assets/vue/components/settings/elements/ListPostcodeComponent.vue index a23f3a7c..efa2a171 100644 --- a/resources/assets/vue/components/settings/elements/ListPostcodeComponent.vue +++ b/resources/assets/vue/components/settings/elements/ListPostcodeComponent.vue @@ -24,7 +24,7 @@
Define Location
- +
From 557881104c6a323b6734c1b81d1af909b81fd435 Mon Sep 17 00:00:00 2001 From: edmondlang Date: Fri, 8 Apr 2022 18:23:54 +0800 Subject: [PATCH 10/67] implement api for warehouse charges --- .../elements/WarehouseChargesComponent.vue | 2 +- .../EditWarehouseChargesFormComponent.vue | 19 +++++++++++++------ resources/views/pages/settings.blade.php | 2 +- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/resources/assets/vue/components/settings/elements/WarehouseChargesComponent.vue b/resources/assets/vue/components/settings/elements/WarehouseChargesComponent.vue index 9deb1d48..5deca5ec 100644 --- a/resources/assets/vue/components/settings/elements/WarehouseChargesComponent.vue +++ b/resources/assets/vue/components/settings/elements/WarehouseChargesComponent.vue @@ -29,7 +29,7 @@
MYR 0.00
- +
diff --git a/resources/assets/vue/components/settings/forms/EditWarehouseChargesFormComponent.vue b/resources/assets/vue/components/settings/forms/EditWarehouseChargesFormComponent.vue index a078576f..f865ddff 100644 --- a/resources/assets/vue/components/settings/forms/EditWarehouseChargesFormComponent.vue +++ b/resources/assets/vue/components/settings/forms/EditWarehouseChargesFormComponent.vue @@ -6,10 +6,10 @@

{{data.name}}

- +
- +
@@ -17,8 +17,7 @@
Cancel
- -
Confirm
+
Confirm
@@ -40,12 +39,20 @@ }, data() { return { - extraCharges: '', + parameters: { + reference: 'WAREHOUSE_CHARGE', + value : { + id: this.data.id, + amount: 0 + } + } }; }, validations: { parameters: { - extraCharges: { required }, + value: { + amount: { required } + } } }, mixins: [modalFormHandler] diff --git a/resources/views/pages/settings.blade.php b/resources/views/pages/settings.blade.php index 51718eae..3ce81768 100644 --- a/resources/views/pages/settings.blade.php +++ b/resources/views/pages/settings.blade.php @@ -428,7 +428,7 @@
From 029f25a003521827da7a4cb7e1c1e33a272b7c1e Mon Sep 17 00:00:00 2001 From: edmondlang Date: Fri, 8 Apr 2022 18:42:30 +0800 Subject: [PATCH 11/67] update state charges --- .../elements/StatesChargesComponent.vue | 2 +- .../forms/EditStateChargesFormComponent.vue | 26 ++++++++++++------- resources/views/pages/settings.blade.php | 2 +- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/resources/assets/vue/components/settings/elements/StatesChargesComponent.vue b/resources/assets/vue/components/settings/elements/StatesChargesComponent.vue index 9e58b60d..dbbd14c8 100644 --- a/resources/assets/vue/components/settings/elements/StatesChargesComponent.vue +++ b/resources/assets/vue/components/settings/elements/StatesChargesComponent.vue @@ -48,7 +48,7 @@
Edit
- +
diff --git a/resources/assets/vue/components/settings/forms/EditStateChargesFormComponent.vue b/resources/assets/vue/components/settings/forms/EditStateChargesFormComponent.vue index ac4052c6..0df2f606 100644 --- a/resources/assets/vue/components/settings/forms/EditStateChargesFormComponent.vue +++ b/resources/assets/vue/components/settings/forms/EditStateChargesFormComponent.vue @@ -6,16 +6,16 @@

{{data.name}}

- +
- +
- +
- +
@@ -23,8 +23,7 @@
Cancel
- -
Confirm
+
Confirm
@@ -47,13 +46,22 @@ data() { return { cityCenterCharges: '', - outskirtCharges : '', + outskirtCharges : '', + parameters: { + status_id: this.data.id, + rate: 0, + value: { + outstation_rate: 0 + } + } }; }, validations: { parameters: { - cityCenterCharges: { required }, - outskirtCharges: { required }, + rate: { required }, + value: { + outstation_rate: { required } + } } }, mixins: [modalFormHandler] diff --git a/resources/views/pages/settings.blade.php b/resources/views/pages/settings.blade.php index 3ce81768..9bb7ba76 100644 --- a/resources/views/pages/settings.blade.php +++ b/resources/views/pages/settings.blade.php @@ -403,7 +403,7 @@
From 1c79d88d8df79e1c4c6eff5dac71977c11e13169 Mon Sep 17 00:00:00 2001 From: edmondlang Date: Fri, 8 Apr 2022 19:05:18 +0800 Subject: [PATCH 12/67] remove service set up and add in base price --- .../forms/EditBasePriceFormComponent.vue | 61 +++++++++++++ resources/views/pages/settings.blade.php | 87 ++----------------- 2 files changed, 70 insertions(+), 78 deletions(-) create mode 100644 resources/assets/vue/components/settings/forms/EditBasePriceFormComponent.vue diff --git a/resources/assets/vue/components/settings/forms/EditBasePriceFormComponent.vue b/resources/assets/vue/components/settings/forms/EditBasePriceFormComponent.vue new file mode 100644 index 00000000..ebf365a1 --- /dev/null +++ b/resources/assets/vue/components/settings/forms/EditBasePriceFormComponent.vue @@ -0,0 +1,61 @@ + + \ No newline at end of file diff --git a/resources/views/pages/settings.blade.php b/resources/views/pages/settings.blade.php index 9bb7ba76..b739a642 100644 --- a/resources/views/pages/settings.blade.php +++ b/resources/views/pages/settings.blade.php @@ -47,26 +47,6 @@ -
-
-
-
-
-
-
-
- -
-
-
Service Setup
-
-
-
-
-
-
-
-
@@ -233,63 +213,6 @@
-
-
- -
-
-
-
-
- Service Configuration -
-
-
-
-
-
-
-
-
-
Payment Attempt Duration Limit
-
-
- -
-
-
-
-
-
-
-
-
- Exchange Services -
-
-
- - - - -
-
- - - -
-
-
-
-
-
@@ -315,6 +238,14 @@
+
+
+ Base Price :0.00
+ + + +
+