diff --git a/app/Classes/Modules/Segments/ControllersLogic/FetchBasePriceLogic.php b/app/Classes/Modules/Segments/ControllersLogic/FetchBasePriceLogic.php
new file mode 100644
index 00000000..49d24bd3
--- /dev/null
+++ b/app/Classes/Modules/Segments/ControllersLogic/FetchBasePriceLogic.php
@@ -0,0 +1,68 @@
+<?php
+
+namespace App\Classes\Modules\Segments\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Segments\Services\FetchesConstant;
+use App\Classes\ValueObjects\Constants\SegmentConstants;
+use App\Http\Resources\ConstantResource;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Carbon\CarbonPeriod;
+
+class FetchBasePriceLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Retrieved Base Price',
+            'message' => 'You have successfully retrieved the Base Price'
+        ];
+    }
+
+
+    /** @var FetchesConstant */
+    private $fetchesConstant;
+
+    /**
+     * FetchConstantLogic constructor.
+     * @param FetchesConstant $fetchesConstant
+     */
+    public function __construct(FetchesConstant $fetchesConstant)
+    {
+        $this->fetchesConstant = $fetchesConstant;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+
+        $constant = $this->fetchesConstant->execute(['segment_id' => $request->route('id'), 'reference' => SegmentConstants::BASE_PRICE]);
+
+        $constantObject = (array) $constant->value;
+
+        if ($request->input('dateFrom') !== null && $request->input('dateTo') !== null) {
+
+            $period = CarbonPeriod::create($request->input('dateFrom'), $request->input('dateTo'));
+
+            $returnObject = [];
+
+            foreach ($period as $date) {
+                array_key_exists($date->format('Y-m-d'), $constantObject) === true ? $returnObject[$date->format('Y-m-d')] = $constantObject[$date->format('Y-m-d')] : '';
+            }
+
+            $constant->value = json_encode($returnObject);
+
+        }
+
+        return $this->resourceResponse(new ConstantResource($constant));
+    }
+
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Segments/FetchBasePriceController.php b/app/Http/Controllers/Segments/FetchBasePriceController.php
new file mode 100644
index 00000000..9ef0b225
--- /dev/null
+++ b/app/Http/Controllers/Segments/FetchBasePriceController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Segments;
+
+use App\Classes\Modules\Segments\ControllersLogic\FetchBasePriceLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class FetchBasePriceController
+{
+    /**
+     * @param Request $request
+     * @param FetchSegmentLogic $logic
+     * @return JsonResponse
+     */
+    public function fetch(Request $request, FetchBasePriceLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
\ No newline at end of file
diff --git a/resources/assets/vue/components/settings/elements/ListBasePriceSectionComponent.vue b/resources/assets/vue/components/settings/elements/ListBasePriceSectionComponent.vue
new file mode 100644
index 00000000..d2b12f67
--- /dev/null
+++ b/resources/assets/vue/components/settings/elements/ListBasePriceSectionComponent.vue
@@ -0,0 +1,190 @@
+<template>
+    <div class="row">
+        <div class="col no-margin">
+            <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="isLoading"></loading-component>
+            <div class="row" v-show="!isLoading">
+                <div class="col">
+                    <div class="row m-b-15 b-b b-grey">
+                        <div class="col-auto p-r-5">
+                           <div class="row m-b-10" @keyup.enter="submitSearch()">
+                                <div class="col-12 col-md mb-2 mb-md-0">
+                                    <div class="row">
+                                        <div class="col p-r-0 h-100">
+                                            <validation-wrapper-component :validator="$v.searchParam.dateFrom">
+                                                <label class="text-primary">Date From</label>
+                                                <date-picker-component v-model="searchParam.dateFrom"></date-picker-component>
+                                            </validation-wrapper-component>
+                                        </div>
+                                        <div class="col p-l-0 h-100">
+                                            <validation-wrapper-component :validator="$v.searchParam.dateTo">
+                                                <label class="text-primary">Date To</label>
+                                                <date-picker-component v-model="searchParam.dateTo"></date-picker-component>
+                                            </validation-wrapper-component>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col-12 col-md-auto m-b-15">
+                                    <div class="row">
+                                        <div class="col p-r-0">
+                                            <div class="btn btn-primary b-rad-none w-100 h-100 d-flex justify-content-center align-items-center p-l-30 p-r-30" @click="submitSearch()">
+                                                Search
+                                            </div>
+                                        </div>
+                                        <div class="col p-l-0">
+                                            <div class="btn btn-secondary b-rad-none w-100 h-100 d-flex justify-content-center align-items-center p-l-30 p-r-30" @click="resetSearch()">
+                                                Reset
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row overflow-hidden" key="2" v-show="!$store.getters.isLoading(section)">
+                        <div class="col">
+                            <div class="row">
+                                <div class="col">
+                                    <div class="row m-b-15 parentContainer" v-for="value, name in basePriceData">
+                                        <div class="col-auto  p-t-10 p-b-10">
+                                            <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px" width="35" height="35" viewBox="0 0 172 172" style=" fill:#000000;"><g fill="none" fill-rule="nonzero" stroke="none" stroke-width="1" stroke-linecap="butt" stroke-linejoin="miter" stroke-miterlimit="10" stroke-dasharray="" stroke-dashoffset="0" font-family="none" font-weight="none" font-size="none" text-anchor="none" style="mix-blend-mode: normal"><path d="M0,172v-172h172v172z" fill="none"></path><g fill="#000000"><path d="M103.92227,17.59053l-9.83877,4.07744l0.13017,10.95576c-1.57504,1.30197 -3.01888,2.74608 -4.32099,4.321l-10.95996,-0.13018l-4.07744,9.83877l7.75596,7.57119c-0.11019,1.02709 -0.22676,2.05006 -0.22676,3.14102c0,1.08989 0.11674,2.11488 0.22676,3.14101l-7.75596,7.57119l4.07744,9.83877l10.95996,-0.13017c1.30164,1.57438 2.74661,3.01935 4.32099,4.32099l-0.13017,10.95996l9.83877,4.07744l7.57119,-7.75596c1.02614,0.11002 2.05112,0.22676 3.14101,0.22676c1.09096,0 2.11393,-0.11657 3.14102,-0.22676l7.57119,7.75596l9.83877,-4.07744l-0.13018,-10.95996c1.57492,-1.30211 3.01903,-2.74596 4.321,-4.32099l10.95576,0.13017l4.07744,-9.83877l-7.75596,-7.56699c0.11027,-1.02745 0.23096,-2.05385 0.23096,-3.14521c0,-1.09099 -0.12077,-2.11391 -0.23096,-3.14102l7.75596,-7.57119l-4.07744,-9.83877l-10.95996,0.13018c-1.30132,-1.57392 -2.74288,-3.01548 -4.3168,-4.3168l0.13018,-10.95996l-9.83877,-4.07744l-7.57119,7.75596c-1.02711,-0.11019 -2.05003,-0.23096 -3.14102,-0.23096c-1.09137,0 -2.11777,0.12068 -3.14521,0.23096zM102.87666,22.67578l6.9875,7.15967l1.0708,-0.14277c1.24766,-0.16622 2.47242,-0.27715 3.69951,-0.27715c1.22709,0 2.45186,0.11092 3.69951,0.27715l1.0708,0.14277l6.9833,-7.15967l4.46377,1.84766l-0.12178,10.00674l0.85664,0.65508c1.96739,1.506 3.72202,3.26064 5.22803,5.22803l0.65508,0.85664l10.00674,-0.12178l1.84766,4.46377l-7.15967,6.9833l0.14277,1.0708c0.16622,1.24765 0.27715,2.47242 0.27715,3.69951c0,1.22709 -0.11094,2.45185 -0.27715,3.69951l-0.14277,1.0708l7.15967,6.9875l-1.84766,4.45957l-10.00674,-0.12178l-0.65508,0.85664c-1.506,1.96739 -3.26064,3.72202 -5.22803,5.22803l-0.85664,0.65928l0.12178,10.00254l-4.46377,1.84766l-6.9833,-7.15547l-1.0708,0.14278c-1.24766,0.16621 -2.47242,0.27295 -3.69951,0.27295c-1.22709,0 -2.45185,-0.10673 -3.69951,-0.27295l-1.0708,-0.14278l-6.9875,7.15547l-4.45957,-1.84766l0.12178,-10.00254l-0.85664,-0.65928c-1.96739,-1.506 -3.72202,-3.26064 -5.22803,-5.22803l-0.65928,-0.85664l-10.00254,0.12178l-1.84766,-4.45957l7.15547,-6.9875l-0.14278,-1.0708c-0.16621,-1.24766 -0.27295,-2.47242 -0.27295,-3.69951c0,-1.22709 0.10673,-2.45186 0.27295,-3.69951l0.14278,-1.0708l-7.15547,-6.9833l1.84766,-4.46377l10.00254,0.12178l0.65928,-0.85664c1.506,-1.96739 3.26064,-3.72202 5.22803,-5.22803l0.85664,-0.65508l-0.0126,-1.0708c0.24311,-0.35649 0.37333,-0.77788 0.37373,-1.20938c0.00046,-0.45042 -0.14055,-0.8896 -0.40312,-1.25557l-0.07978,-6.471zM114.63447,38.01553c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM106.03027,40.3209c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM123.23447,40.3251c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM129.5249,46.61553c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM99.73564,46.61973c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM114.63447,48.76553c-4.72418,0 -8.6,3.87582 -8.6,8.6c0,4.72418 3.87582,8.6 8.6,8.6c4.72418,0 8.6,-3.87582 8.6,-8.6c0,-4.72418 -3.87582,-8.6 -8.6,-8.6zM114.63447,53.06553c2.40029,0 4.3,1.89971 4.3,4.3c0,2.40029 -1.89971,4.3 -4.3,4.3c-2.40029,0 -4.3,-1.89971 -4.3,-4.3c0,-2.40029 1.89971,-4.3 4.3,-4.3zM97.43447,55.21553c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM131.83447,55.21553c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM99.73564,63.81553c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM129.5249,63.81973c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM123.23027,70.11016c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM106.03027,70.11436c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM114.63447,72.41553c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM49.45,86c-2.11154,0 -4.12462,0.40493 -5.97969,1.096c-0.06413,0.00938 0.01818,-0.03126 -0.22676,0.05039l0.05459,-0.02099c-4.64514,1.41446 -26.67344,7.55439 -26.67344,7.55439c-0.76639,0.18192 -1.37197,0.76834 -1.57843,1.52848c-0.20646,0.76015 0.01924,1.57234 0.58829,2.11698c0.56905,0.54464 1.39036,0.73454 2.14073,0.49496c0,0 21.52723,-5.99093 26.62725,-7.5376c0.15215,-0.02315 0.30138,-0.06257 0.44512,-0.11758c1.44208,-0.55307 2.98231,-0.86504 4.60234,-0.86504c2.36119,0 4.55577,0.64061 6.4626,1.75107c0.07465,0.04237 0.15178,0.08023 0.23096,0.11338c0.01655,0.00774 0.03373,0.01741 0.05039,0.02519c13.54894,6.39656 41.06534,20.17357 41.13974,20.21084l0.0084,0.0084c-0.12666,-0.06762 -0.11425,-0.05951 0.14697,0.10918c0.0478,0.03134 0.09683,0.06075 0.14697,0.08818c2.03299,1.09607 3.41397,3.17961 3.41397,5.64375c0,1.2892 -0.38041,2.46929 -1.03301,3.48115c-1.89169,2.94404 -5.54832,3.56604 -8.96953,1.91904c-0.04002,-0.01945 -0.08063,-0.03766 -0.12178,-0.05459l-1.46553,-0.59629c-0.71687,-0.31914 -1.55067,-0.22243 -2.17545,0.25233c-0.62478,0.47476 -0.94132,1.25218 -0.82588,2.02834c0.11544,0.77616 0.64453,1.4278 1.38043,1.70019l1.46553,0.59629l-0.12178,-0.05459c4.32595,2.08254 9.60504,1.61508 12.98818,-1.67549l2.33897,1.5999c0.59985,0.40945 1.36585,0.48842 2.03662,0.20996l35.27764,-14.58389l-0.89443,-1.78467c0.50837,1.01501 1.71821,1.45997 2.76309,1.01621c0.76924,-0.32508 1.61096,-0.50391 2.50693,-0.50391c3.58724,0 6.45,2.86276 6.45,6.45c0,2.4485 -1.36482,4.52585 -3.38037,5.63115c-0.98097,0.53722 -1.3863,1.73677 -0.93222,2.75889l-0.80625,-1.81406l-42.38691,22.49941c0.07149,-0.03502 0.00882,-0.00473 -0.08818,0.02519c-0.10074,0.03192 -0.19899,0.07122 -0.29395,0.11758c-1.15922,0.5584 -2.39759,0.88184 -3.71211,0.88184c-1.26631,0 -2.45713,-0.29156 -3.56934,-0.80205c-0.04957,-0.02291 -0.1,-0.04392 -0.15117,-0.06299c-0.16146,-0.0598 -0.18877,-0.07168 -0.07559,-0.02099l-53.41826,-22.596c-0.48138,-0.20312 -1.02025,-0.22402 -1.51592,-0.05879l-25.8,8.6c-1.12711,0.3757 -1.73625,1.59398 -1.36055,2.72109c0.3757,1.12711 1.59398,1.73625 2.72109,1.36055l25.03154,-8.34385l52.61201,22.25166c0.32436,0.14743 0.39308,0.15071 0.31494,0.12178c1.57664,0.70101 3.33724,1.12959 5.21123,1.12959c2.02658,0 3.915,-0.50557 5.57656,-1.30596c0.12964,-0.04597 0.24436,-0.07554 0.40732,-0.15537c0.02118,-0.01085 0.04218,-0.02205 0.06299,-0.03359l44.22197,-23.46943c0.35464,-0.19087 0.64855,-0.4775 0.84824,-0.82725c2.77594,-1.93469 4.78291,-4.96385 4.78291,-8.6084c0,-5.91146 -4.83854,-10.75 -10.75,-10.75c-1.17645,0 -2.26543,0.31974 -3.32998,0.67188h-0.0042c-0.28668,-0.00166 -0.5708,0.05402 -0.83564,0.16377l-36.05449,14.90303l-1.76367,-1.20517c0.48858,-1.22559 1.13799,-2.38764 1.13799,-3.7835c0,-4.08476 -2.32253,-7.62501 -5.67314,-9.43145l0.14697,0.08818c0.07159,0.04625 -0.07108,-0.08802 -0.45352,-0.29395c-0.01805,-0.01006 -0.03625,-0.01986 -0.05459,-0.02939c0,0 -27.6589,-13.85379 -41.33291,-20.30742c-0.01531,-0.00718 -0.03071,-0.01418 -0.04619,-0.021c-0.2354,-0.10462 -0.25894,-0.10527 -0.14278,-0.05879c-2.46942,-1.3791 -5.31271,-2.19619 -8.34385,-2.19619zM62.35,113.95c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM68.8,116.1c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM75.25,118.25c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15zM81.7,120.4c-1.18741,0 -2.15,0.96259 -2.15,2.15c0,1.18741 0.96259,2.15 2.15,2.15c1.18741,0 2.15,-0.96259 2.15,-2.15c0,-1.18741 -0.96259,-2.15 -2.15,-2.15z"></path></g></g></svg>
+                                        </div>
+                                        <div class="col">
+                                            <div class="row">
+                                                <div class="col-auto p-r-10">
+                                                    <div class="font-heading all-caps fs-8 muted">Date</div>
+                                                </div>
+                                            </div>
+                                            <div class="row">
+                                                <div class="col">
+                                                    <div class="font-heading all-caps">{{ name }}</div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="col">
+                                            <div class="row">
+                                                <div class="col-auto p-r-10">
+                                                    <div class="font-heading all-caps fs-8 muted">Rate</div>
+                                                </div>
+                                            </div>
+                                            <div class="row">
+                                                <div class="col">
+                                                    <div class="font-heading all-caps">{{ value }}</div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="col-auto">
+                                            <div class="row">
+                                                <div class="col">
+                                                    <div class="btn btn-xs btn-primary pointer m-t-10 requestModal" data-type="editCharges">Edit</div>
+                                                    <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="editCharges">
+                                                        <edit-base-price-form-component :data="{'date': name, 'rate': value}" section="basePriceSection"></edit-base-price-form-component>
+                                                    </modal-component>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="row align-items-center justify-content-center p-t-10 p-b-10"  v-if="basePriceData.length === 0">
+                                        <div class="col">
+                                            <div class="row align-items-center justify-content-center  hint-text">
+                                                <div class="col-4 hint-text"><img src="/images/not-found-illustration.png" class="w-100 hint-text"/></div>
+                                            </div>
+                                            <div class="row text-center">
+                                                <div class="col">
+                                                    <div class="row m-t-20">
+                                                        <div class="col">
+                                                            <p class="all-caps no-margin fs-11" style="letter-spacing: 2px;">Nothing To Show Here</p>
+                                                        </div>
+                                                    </div>
+                                                    <div class="row m-t-5 align-items-center justify-content-center hide">
+                                                        <div class="col">
+                                                            <small class="fs-9 muted all-caps font-lato" style="letter-spacing: 2px">There is no results found, Try adjusting your filters to find what you are looking for.</small>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <!-- <div class="row m-t-20">
+                                        <div class="col"></div>
+                                        <div class="col-auto p-r-0" v-show="filters.per_page < metaData.total">
+                                            <pagination-component :section="section" class="mb-5" ref="pagination"></pagination-component>
+                                        </div>
+                                    </div> -->
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    export default {
+        data(){
+            return {
+                section: 'basePriceSection',
+                basePriceData: [],
+                searchParam:{
+                    dateFrom: '04-04-2022', 
+                    dateTo: '05-04-2022', 
+                },
+                filters:{
+                },
+                isLoading: false,
+            }
+        },
+        validations: {
+            searchParam: {
+                dateFrom: {  },
+                dateTo: {  },
+            }
+        },
+        created(){
+            this.setDecoratorDefault();
+            this.$store.dispatch('updateListQueue', {'name': this.section, 'page': 1, 'filters': this.filters});
+        },
+        computed: {
+            pendingList () {
+                return this.$store.getters.isInCompleteQueue(this.section);
+            }
+        },
+        watch: {
+            pendingList(inComplete){
+                if(inComplete){
+                    this.fetchList();
+                }
+            }
+        },
+        methods: {
+            fetchList(){
+                this.submit(this.route('api.segment.constant.basePrice.show', 1) + '?dateFrom=' + this.searchParam.dateFrom + '&dateTo=' + this.searchParam.dateTo, 'get', this.section, false, false);
+                this.isLoading = true;
+            },
+            successHandler(response){
+                this.$store.dispatch('completeList', {'name': this.section, 'data': response.payload.data});
+                this.isLoading = false;
+                this.basePriceData = response.payload.data.value;
+            },
+            submitSearch(){
+                this.fetchList();
+            },
+            resetSearch() {
+                var today = new Date();
+                today = new Date(today.getTime() - ((today.getTimezoneOffset())*60*1000));
+                this.searchParam.dateFrom = today.toISOString().split('T')[0];
+
+                var newDate = new Date();
+                newDate = new Date(newDate.setMonth(newDate.getMonth()+1));
+                newDate = new Date(newDate.getTime() - ((newDate.getTimezoneOffset())*60*1000));
+                this.searchParam.dateTo = newDate.toISOString().split('T')[0];
+
+                this.fetchList();
+            },
+        },
+        mixins: [componentHandler]
+    }
+</script>
diff --git a/resources/assets/vue/components/settings/forms/EditBasePriceFormComponent.vue b/resources/assets/vue/components/settings/forms/EditBasePriceFormComponent.vue
index 3fa9e870..742e95dc 100644
--- a/resources/assets/vue/components/settings/forms/EditBasePriceFormComponent.vue
+++ b/resources/assets/vue/components/settings/forms/EditBasePriceFormComponent.vue
@@ -1,15 +1,16 @@
 <template>
-    <div class="row parentContainer" style="width: 450px; margin: auto;" @keyup.enter="submitForm">
-        <div class="col bg-white b-rad-lg">
+    <div class="row parentContainer padding-40 bg-white b-rad-lg" style="width: 450px; margin: auto;" @keyup.enter="submitForm">
+        <div class="col">
             <div class="row m-b-10">
                 <div class="col">
                     <h2 class="text-center">Edit Base Price</h2>
+                    <p class="text-center">{{ parameters.dateFrom }}</p>
                 </div>
             </div>
-            <validation-wrapper-component class="m-b-15" :validator="$v.parameters.value.amount">
+            <validation-wrapper-component class="m-b-15" :validator="$v.parameters.rate">
                 <label class="text-primary">Base Price (MYR)</label>
                 <div class="controls">
-                    <input type="text" class="form-control fs-12" v-model.trim="parameters.value.amount" v-money="money">
+                    <input type="text" class="form-control fs-12" v-model.trim="parameters.rate" v-money="money">
                 </div>
             </validation-wrapper-component>
             <div class="row m-t-15">
@@ -17,7 +18,7 @@
                     <div class="btn btn-lg btn-default b-rad-none" data-dismiss="modal">Cancel</div>
                 </div>
                 <div class="col p-l-5">
-                    <div class="btn btn-primary w-100 btn-lg" @click="submit(route('api.segment.constant.update', 1), 'put', section, true, true)">Confirm</div>
+                    <div class="btn btn-primary w-100 btn-lg" @click="submit(route('api.segment.constant.basePrice.create', 1), 'post', section, true, true)">Confirm</div>
                 </div>
             </div>
         </div>
@@ -29,11 +30,10 @@
 
     export default {
         props: {
-            // pass in default base price
-            // data: {
-            //     type: Object,
-            //     required: false
-            // },
+            data: {
+                type: Object,
+                required: false
+            },
             section: {
                 default: ''
             },
@@ -41,18 +41,17 @@
         data() {
             return {
                 parameters: {
-                    reference: 'BASE_PRICE',
-                    value : {
-                        amount: 0
-                    }
-                }
+                    dateFrom: this.data.date, 
+                    dateTo: this.data.date, 
+                    rate: this.data.rate
+                },
             };
         },
         validations: {
             parameters: {
-                value: {
-                    amount: { required }
-                }
+                dateFrom: { required },
+                dateTo: { required },
+                rate: { required },
             }
         },
         mixins: [modalFormHandler]
diff --git a/resources/views/pages/settings.blade.php b/resources/views/pages/settings.blade.php
index 7463e2ec..615f3eb3 100644
--- a/resources/views/pages/settings.blade.php
+++ b/resources/views/pages/settings.blade.php
@@ -254,18 +254,7 @@
                                             </modal-component>
                                         </div>
                                     </div>
-                                    <div class="row m-b-20">
-                                        <div class="col">
-                                            <div class="row m-b-20 parentContainer" section="basePriceSection">
-                                                <div class="col">
-                                                    <span class="font-heading all-caps fs-18 muted">Base Price </span> :0.00<i class="fa fa-edit pointer fa-fw m-l-5 requestModal text-primary" data-type="editBasePriceCharges"></i></div>
-                                                    <modal-component class="animate__animated animate__fast animate__fadeIn" type="editBasePriceCharges">
-                                                        {{-- <edit-base-price-form-component :data="{}" section="basePriceSection"></edit-base-price-form-component> --}}
-                                                    </modal-component>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
+                                    <list-base-price-section-component section="basePriceSection"></list-base-price-section-component>
                                 </div>
                             </div>
                         </div>
diff --git a/routes/segment.php b/routes/segment.php
index c74d7c06..1027db5e 100644
--- a/routes/segment.php
+++ b/routes/segment.php
@@ -16,5 +16,6 @@ Route::group(['prefix' => 'segment', 'as' => 'segment.', 'namespace' => 'Segment
         Route::put('/update/postcode', 'UpdateConstantPostcodeController@update')->name('update.postcode');
 
         Route::post('base-price/create', 'CreateBasePriceController@create')->name('basePrice.create');
+        Route::get('base-price/show', 'FetchBasePriceController@fetch')->name('basePrice.show');
     });
 });
\ No newline at end of file