diff --git a/.vscode/launch.json b/.vscode/launch.json
new file mode 100644
index 00000000..ae145ac7
--- /dev/null
+++ b/.vscode/launch.json
@@ -0,0 +1,16 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [{
+        "name": "Listen for XDebug on Docker",
+        "type": "php",
+        "request": "launch",
+        "port": 9002,
+        "pathMappings": {
+            "/var/www/html": "${workspaceFolder}",
+        },
+        "log": true
+    }]
+}
diff --git a/app/Classes/General/Eloquent/Filters/Code.php b/app/Classes/General/Eloquent/Filters/Code.php
new file mode 100644
index 00000000..dc98ed43
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/Code.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class Code implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->where('code',  '=', $value);
+    }
+
+}
diff --git a/app/Classes/General/Eloquent/Filters/HasActiveReward.php b/app/Classes/General/Eloquent/Filters/HasActiveReward.php
new file mode 100644
index 00000000..5770ca6e
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/HasActiveReward.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use App\Classes\ValueObjects\Constants\RoleTypes;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Facades\Auth;
+
+class HasActiveReward implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        if(in_array(Auth::user()->type, RoleTypes::ADMIN_ROLES)){
+            // $userId = $value !== 1 ? $value : Auth::user()->id;
+            $userId = $value;
+            return $builder->where('user_id', $userId)
+            ->where(function ($query) {
+                $query->whereHas('reward', function ($subquery) {
+                    $subquery->where('is_active', true);
+                })
+                ->orWhereDoesntHave('reward');
+            })
+            ->whereDoesntHave('voucher.redemptions.transaction.booking.company.employees', function ($query) use ($userId) {
+                $query->where('user_id', $userId);
+            });
+        }
+        else{
+            return $builder->where('user_id', Auth::user()->id)
+            ->where(function ($query) {
+                $query->whereHas('reward', function ($subquery) {
+                    $subquery->where('is_active', true);
+                })
+                ->orWhereDoesntHave('reward');
+            })
+            ->whereDoesntHave('voucher.redemptions.transaction.owner');
+        }
+    }
+}
diff --git a/app/Classes/General/Eloquent/Filters/HasUsedVoucher.php b/app/Classes/General/Eloquent/Filters/HasUsedVoucher.php
new file mode 100644
index 00000000..fe6cdd92
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/HasUsedVoucher.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Facades\Auth;
+
+class HasUsedVoucher implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->where('user_id', Auth::user()->id)
+        ->where(function ($query) {
+            $query->whereHas('voucher', function ($subquery) {
+                $subquery->whereHas('redemptions', function ($subsubquery) {
+                    $subsubquery->whereHas('transaction', function ($subsubsubquery) {
+                        $subsubsubquery->whereHas('owner');
+                     });
+                });
+            });
+        });
+    }
+}
diff --git a/app/Classes/General/Eloquent/Filters/HasUsedVoucherForAdmin.php b/app/Classes/General/Eloquent/Filters/HasUsedVoucherForAdmin.php
new file mode 100644
index 00000000..83b38ccb
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/HasUsedVoucherForAdmin.php
@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Facades\Auth;
+
+class HasUsedVoucherForAdmin implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        $userId = $value !== 1 ? $value : Auth::user()->id;
+
+        return $builder->where('user_id', $userId)
+        ->where(function ($query) use ($userId){
+            $query->whereHas('voucher', function ($subquery) use ($userId){
+                $subquery->whereHas('redemptions', function ($subsubquery) use ($userId){
+                    $subsubquery->whereHas('transaction', function ($subsubsubquery) use ($userId){
+                        $subsubsubquery->whereHas('booking', function ($s4query) use ($userId){
+                            $s4query->whereHas('company', function ($s5query) use ($userId) {
+                                $s5query->whereHas('employees', function ($s6query) use ($userId){
+                                    $s6query->where('user_id', $userId);
+                                });
+                            });
+                        });
+                    });
+                });
+            });
+        });
+    }
+}
diff --git a/app/Classes/General/Eloquent/Filters/UserId.php b/app/Classes/General/Eloquent/Filters/UserId.php
new file mode 100644
index 00000000..7b8cb9e9
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/UserId.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class UserId implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->where('user_id', $value);
+    }
+
+}
diff --git a/app/Classes/General/Eloquent/Filters/isActive.php b/app/Classes/General/Eloquent/Filters/isActive.php
new file mode 100644
index 00000000..46a2cde7
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/isActive.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class isActive implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->where('is_active', $value);
+    }
+
+}
diff --git a/app/Classes/General/Eloquent/Filters/isActive2.php b/app/Classes/General/Eloquent/Filters/isActive2.php
new file mode 100644
index 00000000..2cd372cb
--- /dev/null
+++ b/app/Classes/General/Eloquent/Filters/isActive2.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Classes\General\Eloquent\Filters;
+
+use Illuminate\Database\Eloquent\Builder;
+
+class isActive2 implements Filter
+{
+
+    /**
+     * @param Builder $builder
+     * @param $value
+     * @return Builder|mixed
+     */
+    public static function apply(Builder $builder, $value)
+    {
+        return $builder->where('is_active', $value);
+    }
+}
diff --git a/app/Classes/General/Helper.php b/app/Classes/General/Helper.php
index 267ee401..ac89540b 100644
--- a/app/Classes/General/Helper.php
+++ b/app/Classes/General/Helper.php
@@ -29,7 +29,7 @@ class Helper
      * @param $log
      * @return array
      */
-    static function debugLoggerForPerfexCRM($log){
+    static function debugLogger($log){
         if($log && isset($log['message'])){
             $message = $log['message'];
             $substring = 'No data were found';
diff --git a/app/Classes/General/Interfaces/Voucherifiable.php b/app/Classes/General/Interfaces/Voucherifiable.php
new file mode 100644
index 00000000..b42427e1
--- /dev/null
+++ b/app/Classes/General/Interfaces/Voucherifiable.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Classes\General\Interfaces;
+
+
+use Illuminate\Database\Eloquent\Relations\MorphMany;
+
+interface Voucherifiable
+{
+    public function voucherifyEntities(): morphMany;
+}
diff --git a/app/Classes/Jobs/UpdatePerfexCRMInvoice.php b/app/Classes/Jobs/UpdatePerfexCRMInvoice.php
index ee395033..e9094f84 100644
--- a/app/Classes/Jobs/UpdatePerfexCRMInvoice.php
+++ b/app/Classes/Jobs/UpdatePerfexCRMInvoice.php
@@ -66,7 +66,7 @@ class UpdatePerfexCRMInvoice implements ShouldQueue
             } else {
                 // Log::error(json_encode('UpdatePerfexCRMInvoice CreatePerfexCRMInvoiceProcessor failed'));
                 $log['message'] = 'UpdatePerfexCRMInvoice CreatePerfexCRMInvoiceProcessor failed';
-                Helper::debugLoggerForPerfexCRM($log);
+                Helper::debugLogger($log);
             }
         }
         else{
diff --git a/app/Classes/Modules/Accounts/ControllersLogic/CreateCustomerLogic.php b/app/Classes/Modules/Accounts/ControllersLogic/CreateCustomerLogic.php
index bdd38aa5..354853c8 100644
--- a/app/Classes/Modules/Accounts/ControllersLogic/CreateCustomerLogic.php
+++ b/app/Classes/Modules/Accounts/ControllersLogic/CreateCustomerLogic.php
@@ -11,7 +11,9 @@ use App\Classes\Modules\Companies\Processors\AssignEmployeeProcessor;
 use App\Classes\Modules\Companies\Processors\AssignSegmentProcessor;
 use App\Classes\Modules\Companies\Processors\CreateCompanyProcessor;
 use App\Classes\Modules\Contacts\Processors\CreateContactProcessor;
-use App\Classes\Modules\PerfexCRM\Processors\CreatePerfexCRMLeadProcessor;
+use App\Classes\Modules\Milestones\Processors\CheckMilestonesForRewardProcessor;
+use App\Classes\Modules\Vouchers\Processors\Voucherify\NewCustomerToVoucherifyProcessor;
+use App\Classes\Modules\Vouchers\Processors\CreateVoucherProcessor;
 use App\Classes\Modules\Companies\DataTransferObjects\EmploymentObject;
 use App\Classes\Modules\PerfexCRM\DataTransferObjects\CreateLeadPerfexCRMObject;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
@@ -63,12 +65,18 @@ class CreateCustomerLogic extends AbstractControllerLogic
     /** @var GenerateEmailVerificationAttemptProcessor */
     private $generateEmailVerificationAttemptProcessor;
 
-    /** @var CreatePerfexCRMLeadProcessor */
-    private $createPerfexCRMLeadProcessor;
-
     /** @var CreatesSeasonalSegment */
     private $createsSeasonalSegment;
 
+    /** @var CheckMilestonesForRewardProcessor */
+    private $checkMilestonesForRewardProcessor;
+
+    /** @var NewCustomerToVoucherifyProcessor */
+    private $newCustomerToVoucherifyProcessor;
+
+    /** @var CreateVoucherProcessor */
+    private $createVoucherProcessor;
+
     /**
      * CreateCustomerLogic constructor.
      * @param CreateUserProcessor $createUserProcessor
@@ -78,11 +86,13 @@ class CreateCustomerLogic extends AbstractControllerLogic
      * @param AssignSegmentProcessor $assignSegmentProcessor
      * @param AuthenticationProcessor $authenticationProcessor
      * @param GenerateEmailVerificationAttemptProcessor $generateEmailVerificationAttemptProcessor
-     * @param CreatePerfexCRMLeadProcessor $createPerfexCRMLeadProcessor
      * @param CreatesSeasonalSegment $createsSeasonalSegment
+     * @param CheckMilestonesForRewardProcessor $checkMilestonesForRewardProcessor
+     * @param NewCustomerToVoucherifyProcessor $newCustomerToVoucherifyProcessor
+     * @param CreateVoucherProcessor $createVoucherProcessor
      */
     public function __construct(CreateUserProcessor $createUserProcessor, CreateCompanyProcessor $createCompanyProcessor, CreateContactProcessor $createContactProcessor, AssignEmployeeProcessor $assignEmployeeProcessor, AssignSegmentProcessor $assignSegmentProcessor, AuthenticationProcessor $authenticationProcessor, GenerateEmailVerificationAttemptProcessor $generateEmailVerificationAttemptProcessor,
-    CreatePerfexCRMLeadProcessor $createPerfexCRMLeadProcessor, CreatesSeasonalSegment $createsSeasonalSegment)
+    CreatesSeasonalSegment $createsSeasonalSegment, CheckMilestonesForRewardProcessor $checkMilestonesForRewardProcessor, NewCustomerToVoucherifyProcessor $newCustomerToVoucherifyProcessor, CreateVoucherProcessor $createVoucherProcessor)
     {
         $this->createUserProcessor = $createUserProcessor;
         $this->createCompanyProcessor = $createCompanyProcessor;
@@ -91,8 +101,10 @@ class CreateCustomerLogic extends AbstractControllerLogic
         $this->assignSegmentProcessor = $assignSegmentProcessor;
         $this->authenticationProcessor = $authenticationProcessor;
         $this->generateEmailVerificationAttemptProcessor = $generateEmailVerificationAttemptProcessor;
-        $this->createPerfexCRMLeadProcessor = $createPerfexCRMLeadProcessor;
         $this->createsSeasonalSegment = $createsSeasonalSegment;
+        $this->checkMilestonesForRewardProcessor = $checkMilestonesForRewardProcessor;
+        $this->newCustomerToVoucherifyProcessor = $newCustomerToVoucherifyProcessor;
+        $this->createVoucherProcessor = $createVoucherProcessor;
     }
 
     /**
@@ -106,6 +118,7 @@ class CreateCustomerLogic extends AbstractControllerLogic
      */
     public function logic(Request $request) : JsonResponse
     {
+
         /** @var User $user */
         $user = $this->createUserProcessor->execute($request, RoleTypes::USER, App::environment(['local']) ? ApprovalStatus::APPROVED : ApprovalStatus::PENDING_VERIFICATION);
 
@@ -132,7 +145,6 @@ class CreateCustomerLogic extends AbstractControllerLogic
         }
 
         if(config('perfexcrm.is_enabled') == 'true'){
-            //$this->createPerfexCRMLeadProcessor->execute($request);
             $createLeadPerfexCRMObject = new CreateLeadPerfexCRMObject(
                 $request->input('name'),
                 $request->input('email'),
@@ -145,7 +157,11 @@ class CreateCustomerLogic extends AbstractControllerLogic
 
         $this->generateEmailVerificationAttemptProcessor->execute($user);
 
-        return $this->response($this->authenticationProcessor->execute($request));
+        $this->newCustomerToVoucherifyProcessor->execute($company->id, $user, true);
+
+        $this->createVoucherProcessor->execute($user, 'WELCOME2EXCHANGE');
+
+        return $this->response($this->authenticationProcessor->execute($request, false));
 
     }
 }
diff --git a/app/Classes/Modules/Accounts/Processors/AuthenticationProcessor.php b/app/Classes/Modules/Accounts/Processors/AuthenticationProcessor.php
index fabb88c6..a310fdb3 100644
--- a/app/Classes/Modules/Accounts/Processors/AuthenticationProcessor.php
+++ b/app/Classes/Modules/Accounts/Processors/AuthenticationProcessor.php
@@ -8,6 +8,9 @@ use App\Classes\Modules\Accounts\Services\AuthenticationRedirect;
 use App\Classes\Modules\Accounts\Services\FetchesUser;
 use App\Classes\Modules\Accounts\Services\GeneratesAuthenticationToken;
 use App\Classes\Modules\Accounts\Standards\Rules\CanAuthenticateUser;
+use App\Classes\Modules\Milestones\Processors\CheckMilestonesForRewardProcessor;
+use App\Classes\Modules\Vouchers\Processors\Voucherify\NewCustomerToVoucherifyProcessor;
+use App\Classes\ValueObjects\Constants\Milestones;
 use Illuminate\Http\Request;
 
 class AuthenticationProcessor
@@ -28,6 +31,13 @@ class AuthenticationProcessor
     /** @var AuthenticationRedirect */
     private $authenticationRedirect;
 
+    /** @var CheckMilestonesForRewardProcessor */
+    private $checkMilestonesForRewardProcessor;
+
+    /** @var NewCustomerToVoucherifyProcessor */
+    private $newCustomerToVoucherifyProcessor;
+
+
     /**
      * AuthenticationProcessor constructor.
      * @param CanAuthenticateUser $canAuthenticateUser
@@ -35,14 +45,18 @@ class AuthenticationProcessor
      * @param GeneratesAuthenticationToken $generatesAuthenticationToken
      * @param FetchesUser $fetchesUser
      * @param AuthenticationRedirect $authenticationRedirect
+     * @param CheckMilestonesForRewardProcessor $checkMilestonesForRewardProcessor
+     * @param NewCustomerToVoucherifyProcessor $newCustomerToVoucherifyProcessor
      */
-    public function __construct(CanAuthenticateUser $canAuthenticateUser, AuthenticatesUser $authenticatesUser, GeneratesAuthenticationToken $generatesAuthenticationToken, FetchesUser $fetchesUser, AuthenticationRedirect $authenticationRedirect)
+    public function __construct(CanAuthenticateUser $canAuthenticateUser, AuthenticatesUser $authenticatesUser, GeneratesAuthenticationToken $generatesAuthenticationToken, FetchesUser $fetchesUser, AuthenticationRedirect $authenticationRedirect, CheckMilestonesForRewardProcessor $checkMilestonesForRewardProcessor, NewCustomerToVoucherifyProcessor $newCustomerToVoucherifyProcessor)
     {
         $this->canAuthenticateUser = $canAuthenticateUser;
         $this->authenticatesUser = $authenticatesUser;
         $this->generatesAuthenticationToken = $generatesAuthenticationToken;
         $this->fetchesUser = $fetchesUser;
         $this->authenticationRedirect = $authenticationRedirect;
+        $this->checkMilestonesForRewardProcessor = $checkMilestonesForRewardProcessor;
+        $this->newCustomerToVoucherifyProcessor = $newCustomerToVoucherifyProcessor;
     }
 
 
@@ -53,7 +67,7 @@ class AuthenticationProcessor
      * @throws \App\Classes\Exceptions\AccessUnauthorisedException
      * @throws \App\Classes\Exceptions\RequestValidationException
      */
-    public function execute(Request $request): array {
+    public function execute(Request $request, bool $isSignIn = true): array {
 
         $object = new AuthenticationCredentialsObject($request->input('email'), $request->input('password'));
 
@@ -63,8 +77,13 @@ class AuthenticationProcessor
 
         $user = $this->fetchesUser->execute(['email' => $object->getEmail()]);
 
+        if($isSignIn){
+            $this->newCustomerToVoucherifyProcessor->execute(0, $user, false);
+        }
+
+        //cief todo: case study 1
+        $this->checkMilestonesForRewardProcessor->execute($user, [Milestones::MILESTONE_1]);
+
         return ['access_token' => $this->generatesAuthenticationToken->execute($user), 'redirect_url' => $this->authenticationRedirect->url($user)];
-
     }
-
-}
\ No newline at end of file
+}
diff --git a/app/Classes/Modules/Addresses/ControllersLogic/CreateAddressLogic.php b/app/Classes/Modules/Addresses/ControllersLogic/CreateAddressLogic.php
index 8fd6fe7f..a760254f 100644
--- a/app/Classes/Modules/Addresses/ControllersLogic/CreateAddressLogic.php
+++ b/app/Classes/Modules/Addresses/ControllersLogic/CreateAddressLogic.php
@@ -9,10 +9,12 @@ use App\Classes\Modules\Addresses\Services\FetchesDistrict;
 use App\Classes\Modules\Addresses\Standards\Rules\CanCreateAddress;
 use App\Classes\Modules\Addresses\DataTransferObjects\AddressObject;
 use App\Classes\Modules\Companies\Services\FetchesCompany;
+use App\Classes\Modules\Milestones\Processors\CheckMilestonesForRewardProcessor;
 use App\Http\Resources\AddressResource;
 use ErrorException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use App\Classes\ValueObjects\Constants\Milestones;
 
 class CreateAddressLogic extends AbstractControllerLogic
 {
@@ -39,19 +41,25 @@ class CreateAddressLogic extends AbstractControllerLogic
     /** @var CreatesAddress */
     private $createsAddress;
 
+    /** @var CheckMilestonesForRewardProcessor */
+    private $checkMilestonesForRewardProcessor;
+
+
     /**
      * CreateAddressLogic constructor.
      * @param CanCreateAddress $canCreateAddress
      * @param FetchesDistrict $fetchesDistrict
      * @param FetchesCompany $fetchesCompany
      * @param CreatesAddress $createsAddress
+     * @param CheckMilestonesForRewardProcessor $checkMilestonesForRewardProcessor
      */
-    public function __construct(CanCreateAddress $canCreateAddress, FetchesDistrict $fetchesDistrict, FetchesCompany $fetchesCompany, CreatesAddress $createsAddress)
+    public function __construct(CanCreateAddress $canCreateAddress, FetchesDistrict $fetchesDistrict, FetchesCompany $fetchesCompany, CreatesAddress $createsAddress, CheckMilestonesForRewardProcessor $checkMilestonesForRewardProcessor)
     {
         $this->canCreateAddress = $canCreateAddress;
         $this->fetchesDistrict = $fetchesDistrict;
         $this->fetchesCompany = $fetchesCompany;
         $this->createsAddress = $createsAddress;
+        $this->checkMilestonesForRewardProcessor = $checkMilestonesForRewardProcessor;
     }
 
     /**
@@ -70,10 +78,15 @@ class CreateAddressLogic extends AbstractControllerLogic
 
         $this->canCreateAddress->passes($object);
 
-        $query = $this->createsAddress->execute($this->fetchesCompany->execute(['id' => $request->input('company_id')]), $object);
+        $company = $this->fetchesCompany->execute(['id' => $request->input('company_id')]);
+        $query = $this->createsAddress->execute($company, $object);
+
+        //cief todo: case study 6
+        // $user = $company->employees()->first();
+        // $this->checkMilestonesForRewardProcessor->execute($user, [Milestones::MILESTONE_6]);
 
         return $this->resourceResponse(new AddressResource($query));
 
     }
 
-}
\ No newline at end of file
+}
diff --git a/app/Classes/Modules/Banks/ControllersLogic/CreateBankLogic.php b/app/Classes/Modules/Banks/ControllersLogic/CreateBankLogic.php
index dc67848a..bb9a3468 100644
--- a/app/Classes/Modules/Banks/ControllersLogic/CreateBankLogic.php
+++ b/app/Classes/Modules/Banks/ControllersLogic/CreateBankLogic.php
@@ -8,7 +8,10 @@ use App\Classes\Modules\Banks\Standards\Rules\CanCreateBank;
 use App\Classes\Modules\Banks\Services\CreatesBank;
 use App\Classes\Modules\Banks\Services\CreatesBankLog;
 use App\Classes\Modules\Banks\DataTransferObjects\BankObject;
+use App\Classes\Modules\Companies\Services\FetchesCompany;
+use App\Classes\Modules\Milestones\Processors\CheckMilestonesForRewardProcessor;
 use App\Http\Resources\BankResource;
+use App\Classes\ValueObjects\Constants\Milestones;
 
 use ErrorException;
 use Illuminate\Http\JsonResponse;
@@ -36,21 +39,34 @@ class CreateBankLogic extends AbstractControllerLogic
     /** @var CreatesBankLog */
     private $createsBankLog;
 
+    /** @var FetchesCompany */
+    private $fetchesCompany;
+
+    /** @var CheckMilestonesForRewardProcessor */
+    private $checkMilestonesForRewardProcessor;
+
+
     /**
      * CreateBankLogic constructor.
      * @param CanCreateBank $canCreateBank
      * @param CreatesBank $createsBank
      * @param CreatesBankLog $createsBankLog
+     * @param FetchesCompany $fetchesCompany
+     * @param CheckMilestonesForRewardProcessor $checkMilestonesForRewardProcessor
      */
     public function __construct(
         CanCreateBank $canCreateBank,
         CreatesBank $createsBank,
-        CreatesBankLog $createsBankLog
+        CreatesBankLog $createsBankLog,
+        FetchesCompany $fetchesCompany,
+        CheckMilestonesForRewardProcessor $checkMilestonesForRewardProcessor
     )
     {
         $this->canCreateBank = $canCreateBank;
         $this->createsBank = $createsBank;
         $this->createsBankLog = $createsBankLog;
+        $this->fetchesCompany = $fetchesCompany;
+        $this->checkMilestonesForRewardProcessor = $checkMilestonesForRewardProcessor;
     }
 
     /**
@@ -73,7 +89,12 @@ class CreateBankLogic extends AbstractControllerLogic
 
 //        $bankLog = $this->createsBankLog->execute($bank);
 
+        //cief todo: case study 4
+        // $company = $this->fetchesCompany->execute(['id' => $request->input('company_id')]);
+        // $user = $company->employees()->first();
+        // $this->checkMilestonesForRewardProcessor->execute($user, [Milestones::MILESTONE_4]);
+
         return $this->resourceResponse(new BankResource($bank));
 
     }
-}
\ No newline at end of file
+}
diff --git a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingLogic.php
index a93a3654..61f78dcb 100644
--- a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingLogic.php
+++ b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingLogic.php
@@ -14,7 +14,8 @@ use App\Classes\Modules\Bookings\Services\GeneratesBookingMarking;
 
 use App\Classes\Modules\Bookings\DataTransferObjects\BookingObject;
 use App\Classes\Modules\PerfexCRM\Processors\BookingToPerfexCRMProcessor;
-
+use App\Classes\Modules\Milestones\Processors\CheckMilestonesForRewardProcessor;
+use App\Classes\ValueObjects\Constants\Milestones;
 use App\Http\Resources\BookingResource;
 
 use App\Models\Booking;
@@ -50,6 +51,10 @@ class CreateBookingLogic extends AbstractControllerLogic
     /** @var BookingToPerfexCRMProcessor */
     private $bookingToPerfexCRMProcessor;
 
+    /** @var CheckMilestonesForRewardProcessor */
+    private $checkMilestonesForRewardProcessor;
+
+
     /**
      * CreateBookingLogic constructor.
      * @param CanCreateBooking $canCreateBooking
@@ -57,14 +62,16 @@ class CreateBookingLogic extends AbstractControllerLogic
      * @param GeneratesBookingMarking $generatesBookingMarking
      * @param FetchesCompany $fetchesCompany
      * @param BookingToPerfexCRMProcessor $bookingToPerfexCRMProcessor
+     * @param CheckMilestoneForRewardProcessor $checkMilestonesForRewardProcessor
      */
-    public function __construct(CanCreateBooking $canCreateBooking, CreatesBooking $createsBooking, GeneratesBookingMarking $generatesBookingMarking, FetchesCompany $fetchesCompany, BookingToPerfexCRMProcessor $bookingToPerfexCRMProcessor)
+    public function __construct(CanCreateBooking $canCreateBooking, CreatesBooking $createsBooking, GeneratesBookingMarking $generatesBookingMarking, FetchesCompany $fetchesCompany, BookingToPerfexCRMProcessor $bookingToPerfexCRMProcessor, CheckMilestonesForRewardProcessor $checkMilestonesForRewardProcessor)
     {
         $this->canCreateBooking = $canCreateBooking;
         $this->createsBooking = $createsBooking;
         $this->generatesBookingMarking = $generatesBookingMarking;
         $this->fetchesCompany = $fetchesCompany;
         $this->bookingToPerfexCRMProcessor = $bookingToPerfexCRMProcessor;
+        $this->checkMilestonesForRewardProcessor = $checkMilestonesForRewardProcessor;
     }
 
 
@@ -90,6 +97,10 @@ class CreateBookingLogic extends AbstractControllerLogic
             $this->bookingToPerfexCRMProcessor->execute($booking);
         }
 
+        //cief todo: case study 5
+        // $user = $company->employees()->first();
+        // $this->checkMilestonesForRewardProcessor->execute($user, [Milestones::MILESTONE_5]);
+
         return $this->resourceResponse(new BookingResource($booking));
 
     }
diff --git a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingPaymentLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingPaymentLogic.php
index 199531f4..c429d91d 100644
--- a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingPaymentLogic.php
+++ b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingPaymentLogic.php
@@ -8,24 +8,20 @@ use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Bookings\Services\CalculatesBookingOutstanding;
 use App\Classes\Modules\Bookings\Services\FetchesBookingQuotation;
 use App\Classes\Modules\Companies\Services\FetchesCompanyPaymentAttemptLimit;
-use App\Classes\Modules\Currencies\DataTransferObjects\CurrencyConversionObject;
-use App\Classes\Modules\Vouchers\DataTransferObjects\VoucherObject;
 use App\Classes\Modules\Transactions\DataTransferObjects\TransactionObject;
 use App\Classes\Modules\Transactions\Services\CreatesTransaction;
 use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
 use App\Classes\Modules\Billplzs\Services\CreatesBillplzBill;
 use App\Classes\Modules\Transactions\Services\UpdatesTransactionStatus;
-use App\Classes\Modules\Vouchers\Services\FetchesVoucher;
-use App\Classes\Modules\Vouchers\Services\CreatesVoucher;
-use App\Classes\Modules\Vouchers\Services\CreatesVoucherRedemption;
-use App\Classes\Modules\Vouchers\Services\RedeemsVoucher;
 use App\Classes\Modules\Wallets\Services\UpdatesWalletBalance;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\PaymentMethodType;
 use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Classes\Modules\Currencies\DataTransferObjects\CurrencyConversionObject;
 use App\Http\Resources\TransactionResource;
 
 use App\Classes\Modules\Transactions\Processors\CreateCashBackTransactionProcessor;
+use App\Classes\Modules\Vouchers\Processors\Voucherify\BookingToVoucherifyProcessor;
 
 use App\Models\Booking;
 use App\Models\Transaction;
@@ -78,17 +74,9 @@ class CreateBookingPaymentLogic extends AbstractControllerLogic
     /** @var RecalculatesWalletBalance */
     private $recalculatesWalletBalance;
 
-    /** @var FetchesVoucher */
-    private $fetchesVoucher;
+    /** @var BookingToVoucherifyProcessor */
+    private $bookingToVoucherifyProcessor;
 
-    /** @var CreatesVoucher */
-    private $createsVoucher;
-
-    /** @var CreatesVoucherRedemption */
-    private $createsVoucherRedemption;
-
-    /** @var RedeemsVoucher */
-    private $redeemsVoucher;
     /**
      * CreateBookingPaymentLogic constructor.
      * @param FetchesBookingQuotation $fetchBookingQuotation
@@ -101,12 +89,9 @@ class CreateBookingPaymentLogic extends AbstractControllerLogic
      * @param UpdatesTransactionStatus $updatesTransactionStatus
      * @param CreateCashBackTransactionProcessor $createCashBackTransactionProcessor
      * @param RecalculatesWalletBalance $recalculatesWalletBalance
-     * @param FetchesVoucher $fetchesVoucher
-     * @param CreatesVoucher $createsVoucher
-     * @param CreatesVoucherRedemption $createsVoucherRedemption
-     * @param RedeemVoucher $redeemVoucher
+     * @param BookingToVoucherifyProcessor $bookingToVoucherifyProcessor
      */
-    public function __construct(FetchesBookingQuotation $fetchBookingQuotation, FetchesCompanyPaymentAttemptLimit $fetchesCompanyPaymentAttemptLimit, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CreatesTransaction $createsTransaction, CalculatesBookingOutstanding $calculatesBookingOutstanding, CreatesBillplzBill $createsBillplzBill, UpdatesWalletBalance $updatesWalletBalance, UpdatesTransactionStatus $updatesTransactionStatus, CreateCashBackTransactionProcessor $createCashBackTransactionProcessor, RecalculatesWalletBalance $recalculatesWalletBalance, FetchesVoucher $fetchesVoucher, CreatesVoucher $createsVoucher, CreatesVoucherRedemption $createsVoucherRedemption, RedeemsVoucher $redeemsVoucher)
+    public function __construct(FetchesBookingQuotation $fetchBookingQuotation, FetchesCompanyPaymentAttemptLimit $fetchesCompanyPaymentAttemptLimit, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CreatesTransaction $createsTransaction, CalculatesBookingOutstanding $calculatesBookingOutstanding, CreatesBillplzBill $createsBillplzBill, UpdatesWalletBalance $updatesWalletBalance, UpdatesTransactionStatus $updatesTransactionStatus, CreateCashBackTransactionProcessor $createCashBackTransactionProcessor, RecalculatesWalletBalance $recalculatesWalletBalance, BookingToVoucherifyProcessor $bookingToVoucherifyProcessor)
     {
         $this->fetchBookingQuotation = $fetchBookingQuotation;
         $this->fetchesCompanyPaymentAttemptLimit = $fetchesCompanyPaymentAttemptLimit;
@@ -118,10 +103,7 @@ class CreateBookingPaymentLogic extends AbstractControllerLogic
         $this->updatesTransactionStatus = $updatesTransactionStatus;
         $this->createCashBackTransactionProcessor = $createCashBackTransactionProcessor;
         $this->recalculatesWalletBalance = $recalculatesWalletBalance;
-        $this->fetchesVoucher = $fetchesVoucher;
-        $this->createsVoucher = $createsVoucher;
-        $this->createsVoucherRedemption = $createsVoucherRedemption;
-        $this->redeemsVoucher = $redeemsVoucher;
+        $this->bookingToVoucherifyProcessor = $bookingToVoucherifyProcessor;
     }
 
     /**
@@ -131,11 +113,7 @@ class CreateBookingPaymentLogic extends AbstractControllerLogic
      */
     public function logic(Request $request) : JsonResponse
     {
-        $voucherCode = $request->input('voucher_code'); //cief to, json_encode and json_decode ???
-        // if($voucherReqInput){
-        //     $voucherObject = json_decode($voucherReqInput);
-        //     $validatedVoucherObject = new ValidatedVoucherObject($voucherObject->metadata->name, $voucherObject->code, $voucherObject->discount->type, $voucherObject->discount->amount_off);
-        // }
+        $voucherCode = $request->input('voucher_code');
 
         $booking = Booking::find($request->route('id'));
 
@@ -189,34 +167,12 @@ class CreateBookingPaymentLogic extends AbstractControllerLogic
         $transaction = $this->createsTransaction->execute($booking, $object);
 //        $cash_back_transaction = $this->createCashBackTransactionProcessor->execute($transaction);
 
+        $this->bookingToVoucherifyProcessor->execute($booking->company->employees()->first(), $transaction, $booking->company->id, $configurations->getSubTotal(), $configurations->getVoucherDiscountAmount(), $voucherCode);
+
         if(PaymentMethodType::PAYMENT_METHODS[$request->input('payment_method')] == PaymentMethodType::WALLET){
             $this->updatesTransactionStatus->execute($transaction, ApprovalStatus::APPROVED);
         }
 
-        //Voucherify
-        if($voucherCode){
-            $employee = $booking->company->employees()->first();
-
-            $result = $this->redeemsVoucher->execute($voucherCode, $configurations->getSubTotal(), $employee);
-            $voucher = $result->voucher;
-            $redemptionId = $result->id;
-            //Update Database
-            $voucherValue = 0.00;
-            if(isset($voucher->discount->amount_off)){
-                $voucherValue =$voucher->discount->amount_off;
-            }
-            if($voucherValue == 0.00){
-                if(isset($voucher->discount->percent_off)){
-                    $voucherValue =$voucher->discount->percent_off;
-                }
-            }
-
-            $voucherObject= new VoucherObject($voucher->code, isset($voucher->metadata->name) ? $voucher->metadata->name : "", $voucher->discount->type, $voucherValue);
-            $voucher = $this->createsVoucher->execute($voucherObject);
-            if(!$voucher) $voucher = $this->fetchesVoucher->execute(['code' => $voucherObject->getCode()]);
-            $this->createsVoucherRedemption->execute($transaction, $voucher, $redemptionId, $configurations->getVoucherDiscountAmount());
-        }
-
         return $this->resourceResponse(new TransactionResource($transaction));
     }
 
diff --git a/app/Classes/Modules/Bookings/Services/FetchesBookingQuotation.php b/app/Classes/Modules/Bookings/Services/FetchesBookingQuotation.php
index c81f7bba..5fe85c35 100644
--- a/app/Classes/Modules/Bookings/Services/FetchesBookingQuotation.php
+++ b/app/Classes/Modules/Bookings/Services/FetchesBookingQuotation.php
@@ -8,8 +8,9 @@ use App\Classes\Modules\Bookings\DataTransferObjects\CalculationObject;
 use App\Classes\Modules\Companies\Services\FetchesCompanyServiceSettings;
 use App\Classes\Modules\Currencies\DataTransferObjects\CurrencyConversionObject;
 use App\Classes\Modules\Vouchers\DataTransferObjects\ValidatedVoucherObject;
+use App\Classes\Modules\Vouchers\DataTransferObjects\ValidateVoucherifyVoucherObject;
 use App\Classes\Modules\Currencies\Services\FetchesCurrency;
-use App\Classes\Modules\Vouchers\Services\ValidatesVoucher;
+use App\Classes\Modules\Vouchers\Services\Voucherify\ValidatesVoucherifyVoucher;
 use App\Models\Company;
 use App\Models\Currency;
 
@@ -22,19 +23,19 @@ class FetchesBookingQuotation
     /** @var FetchesCurrency */
     private $fetchesCurrency;
 
-    /** @var ValidatesVoucher */
-    private $validatesVoucher;
+    /** @var ValidatesVoucherifyVoucher */
+    private $validatesVoucherifyVoucher;
 
     /**
      * FetchesBookingQuotation constructor.
      * @param FetchesCompanyServiceSettings $fetchesCompanyServiceSettings
      * @param FetchesCurrency $fetchesCurrency
      */
-    public function __construct(FetchesCompanyServiceSettings $fetchesCompanyServiceSettings, FetchesCurrency $fetchesCurrency, ValidatesVoucher $validatesVoucher)
+    public function __construct(FetchesCompanyServiceSettings $fetchesCompanyServiceSettings, FetchesCurrency $fetchesCurrency, ValidatesVoucherifyVoucher $validatesVoucherifyVoucher)
     {
         $this->fetchesCompanyServiceSettings = $fetchesCompanyServiceSettings;
         $this->fetchesCurrency = $fetchesCurrency;
-        $this->validatesVoucher = $validatesVoucher;
+        $this->validatesVoucherifyVoucher = $validatesVoucherifyVoucher;
     }
 
 
@@ -59,15 +60,15 @@ class FetchesBookingQuotation
         //Voucherify
         if($voucherCode){
             $employee = $company->employees()->first();
-
-            $result = $this->validatesVoucher->execute($voucherCode, $calculationObject->getSubTotal(), $employee);
+            $validateVoucherifyVoucherObject = new ValidateVoucherifyVoucherObject($company->id, $voucherCode, $calculationObject->getSubTotal(), $employee);
+            $result = $this->validatesVoucherifyVoucher->execute($validateVoucherifyVoucherObject);
             $voucher = [
                 "code" => $result->code,
-                "discount" => $result->discount,
+                "discount" => property_exists($result, 'discount') ? $result->discount : null,
                 "metadata" => $result->metadata,
                 "order" => $result->order,
             ];
-            $validatedVoucherObject = new ValidatedVoucherObject(isset($voucher['metadata']->name) ? $voucher['metadata']->name: "", $voucher['code'], $voucher['discount']->type, $voucher['order']->total_discount_amount, $voucher['order']->total_amount);
+            $validatedVoucherObject = new ValidatedVoucherObject(isset($voucher['metadata']->name) ? $voucher['metadata']->name: "", $voucher['code'], $voucher['discount']->type ?? 'AMOUNT', $voucher['order']->total_discount_amount, $voucher['order']->total_amount);
             $calculationObject = new CalculationObject($conversionObject, $configurations, $validatedVoucherObject);
         }
 
diff --git a/app/Classes/Modules/Companies/ControllersLogic/AssignCompanyToSegmentLogic.php b/app/Classes/Modules/Companies/ControllersLogic/AssignCompanyToSegmentLogic.php
index f814057f..7df8e2f0 100644
--- a/app/Classes/Modules/Companies/ControllersLogic/AssignCompanyToSegmentLogic.php
+++ b/app/Classes/Modules/Companies/ControllersLogic/AssignCompanyToSegmentLogic.php
@@ -7,8 +7,10 @@ use App\Classes\General\Abstracts\AbstractControllerLogic;
 use App\Classes\Modules\Companies\Processors\AssignSegmentProcessor;
 use App\Classes\Modules\Companies\Services\FetchesCompany;
 use App\Classes\Modules\Segments\DataTransferObjects\SeasonalSegmentObject;
+use App\Classes\Modules\Milestones\Processors\CheckMilestonesForRewardProcessor;
 use App\Classes\Modules\Segments\Services\CreatesSeasonalSegment;
 use App\Http\Resources\CompanyResource;
+use App\Classes\ValueObjects\Constants\Milestones;
 use App\Models\SeasonalSegment;
 use Carbon\Carbon;
 use Illuminate\Http\JsonResponse;
@@ -36,17 +38,22 @@ class AssignCompanyToSegmentLogic extends AbstractControllerLogic
     /** @var CreatesSeasonalSegment */
     private $createsSeasonalSegment;
 
+    /** @var CheckMilestonesForRewardProcessor */
+    private $checkMilestonesForRewardProcessor;
+
     /**
      * AssignCompanyToSegmentLogic constructor.
      * @param FetchesCompany $fetchesCompany
      * @param AssignSegmentProcessor $assignCompanyToSegmentProcessor
      * @param CreatesSeasonalSegment $createsSeasonalSegment
+     * @param CheckMilestonesForRewardProcessor $checkMilestonesForRewardProcessor
      */
-    public function __construct(FetchesCompany $fetchesCompany, AssignSegmentProcessor $assignCompanyToSegmentProcessor, CreatesSeasonalSegment $createsSeasonalSegment)
+    public function __construct(FetchesCompany $fetchesCompany, AssignSegmentProcessor $assignCompanyToSegmentProcessor, CreatesSeasonalSegment $createsSeasonalSegment, CheckMilestonesForRewardProcessor $checkMilestonesForRewardProcessor)
     {
         $this->fetchesCompany = $fetchesCompany;
         $this->assignCompanyToSegmentProcessor = $assignCompanyToSegmentProcessor;
         $this->createsSeasonalSegment = $createsSeasonalSegment;
+        $this->checkMilestonesForRewardProcessor = $checkMilestonesForRewardProcessor;
     }
 
     /**
@@ -75,12 +82,16 @@ class AssignCompanyToSegmentLogic extends AbstractControllerLogic
             // }
 
             $start_date = $request->input('starting_on') ? $request->input('starting_on') : Carbon::now();
-            
+
             $seasonalSegmentObject = new SeasonalSegmentObject($company->id, $request->input('segment_id'), $start_date, $request->input('ending_on') ?? null);
 
             $this->createsSeasonalSegment->execute($seasonalSegmentObject);
-        } 
-        
+        }
+
+        //cief todo: case study 3
+        $user = $company->employees()->first();
+        $this->checkMilestonesForRewardProcessor->execute($user, [Milestones::MILESTONE_3]);
+
         return $this->resourceResponse(new CompanyResource($company));
     }
-}
\ No newline at end of file
+}
diff --git a/app/Classes/Modules/Companies/ControllersLogic/CreateIdentificationDocumentLogic.php b/app/Classes/Modules/Companies/ControllersLogic/CreateIdentificationDocumentLogic.php
index c08dc4ef..b59e77f6 100644
--- a/app/Classes/Modules/Companies/ControllersLogic/CreateIdentificationDocumentLogic.php
+++ b/app/Classes/Modules/Companies/ControllersLogic/CreateIdentificationDocumentLogic.php
@@ -10,9 +10,11 @@ use App\Classes\Modules\Documents\DataTransferObjects\DocumentObject;
 use App\Classes\Modules\Documents\Services\CreatesDocument;
 use App\Classes\Modules\Documents\Services\CreatesFiles;
 use App\Classes\Modules\PerfexCRM\Processors\NewLeadTaskToPerfexCRMProcessor;
+use App\Classes\Modules\Milestones\Processors\CheckMilestonesForRewardProcessor;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\CompanyType;
 use App\Classes\ValueObjects\Constants\DocumentType;
+use App\Classes\ValueObjects\Constants\Milestones;
 use App\Models\Company;
 use App\Models\Document;
 use Illuminate\Http\JsonResponse;
@@ -46,6 +48,9 @@ class CreateIdentificationDocumentLogic extends AbstractControllerLogic
     /** @var NewLeadTaskToPerfexCRMProcessor */
     private $newLeadTaskToPerfexCRMProcessor;
 
+    /** @var CheckMilestonesForRewardProcessor */
+    private $checkMilestonesForRewardProcessor;
+
     /**
      * CreateIdentificationDocumentLogic constructor.
      * @param FetchesCompany $fetchesCompany
@@ -53,14 +58,16 @@ class CreateIdentificationDocumentLogic extends AbstractControllerLogic
      * @param CreatesFiles $createsFile
      * @param UpdatesCompanyStatus $updatesCompanyStatus
      * @param NewLeadTaskToPerfexCRMProcessor $newLeadTaskToPerfexCRMProcessor
+     * @param CheckMilestoneForRewardProcessor $checkMilestonesForRewardProcessor
      */
-    public function __construct(FetchesCompany $fetchesCompany, CreatesDocument $createsDocument, CreatesFiles $createsFile, UpdatesCompanyStatus $updatesCompanyStatus, NewLeadTaskToPerfexCRMProcessor $newLeadTaskToPerfexCRMProcessor)
+    public function __construct(FetchesCompany $fetchesCompany, CreatesDocument $createsDocument, CreatesFiles $createsFile, UpdatesCompanyStatus $updatesCompanyStatus, NewLeadTaskToPerfexCRMProcessor $newLeadTaskToPerfexCRMProcessor, CheckMilestonesForRewardProcessor $checkMilestonesForRewardProcessor)
     {
         $this->fetchesCompany = $fetchesCompany;
         $this->createsDocument = $createsDocument;
         $this->createsFile = $createsFile;
         $this->updatesCompanyStatus = $updatesCompanyStatus;
         $this->newLeadTaskToPerfexCRMProcessor = $newLeadTaskToPerfexCRMProcessor;
+        $this->checkMilestonesForRewardProcessor = $checkMilestonesForRewardProcessor;
     }
 
     /**
@@ -87,6 +94,10 @@ class CreateIdentificationDocumentLogic extends AbstractControllerLogic
             $this->newLeadTaskToPerfexCRMProcessor->execute($company);
         }
 
+        //cief todo: case study 2
+        $user = $company->employees()->first();
+        $this->checkMilestonesForRewardProcessor->execute($user, [Milestones::MILESTONE_2]);
+
         return $this->response([]);
     }
 
diff --git a/app/Classes/Modules/Milestones/ControllersLogic/CreateMilestoneLogic.php b/app/Classes/Modules/Milestones/ControllersLogic/CreateMilestoneLogic.php
new file mode 100644
index 00000000..db30f789
--- /dev/null
+++ b/app/Classes/Modules/Milestones/ControllersLogic/CreateMilestoneLogic.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace App\Classes\Modules\Milestones\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Rewards\Services\FetchesReward;
+use App\Classes\Modules\Milestones\Processors\CreateMilestoneProcessor;
+use App\Classes\Modules\Milestones\Processors\AssignRewardProcessor;
+use App\Classes\Modules\Milestones\DataTransferObjects\AchievementObject;
+use App\Http\Resources\MilestoneResource;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use App\Models\Reward;
+
+class CreateMilestoneLogic extends AbstractControllerLogic
+{
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Create Milestone',
+            'message' => 'You have successfully created a milestone'
+        ];
+    }
+
+    /** @var FetchesReward */
+    private $fetchesReward;
+
+    /** @var CreateMilestoneProcessor */
+    private $createMilestoneProcessor;
+
+    /** @var AssignRewardProcessor */
+    private $assignRewardProcessor;
+
+    /**
+     * CreateMilestoneLogic constructor.
+     */
+    public function __construct(CreateMilestoneProcessor $createMilestoneProcessor, FetchesReward $fetchesReward, AssignRewardProcessor $assignRewardProcessor)
+    {
+        $this->createMilestoneProcessor = $createMilestoneProcessor;
+        $this->fetchesReward = $fetchesReward;
+        $this->assignRewardProcessor = $assignRewardProcessor;
+    }
+
+    /**
+     * @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
+    {
+        $milestone = $this->createMilestoneProcessor->execute($request);
+
+        //Extra checking to make sure that each reward exists
+        $rewardIds = $request->input('reward_ids');
+        foreach ($rewardIds as $rewardId) {
+            /** @var Reward $reward */
+            $this->fetchesReward->execute(['id' => $rewardId]);
+        }
+
+        $object = new AchievementObject($milestone, $rewardIds);
+        $this->assignRewardProcessor->execute($object);
+
+        return $this->resourceResponse(new MilestoneResource($milestone));
+    }
+}
diff --git a/app/Classes/Modules/Milestones/ControllersLogic/DeleteMilestoneLogic.php b/app/Classes/Modules/Milestones/ControllersLogic/DeleteMilestoneLogic.php
new file mode 100644
index 00000000..5a2fbef2
--- /dev/null
+++ b/app/Classes/Modules/Milestones/ControllersLogic/DeleteMilestoneLogic.php
@@ -0,0 +1,74 @@
+<?php
+
+namespace App\Classes\Modules\Milestones\ControllersLogic;
+
+use App\Http\Resources\MilestoneResource;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+
+use App\Classes\Modules\Milestones\Services\FetchesMilestone;
+
+use App\Classes\Modules\Milestones\Standards\Rules\CanDeleteMilestone;
+use App\Classes\Modules\Milestones\Services\DeletesMilestone;
+
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class DeleteMilestoneLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Delete Milestone',
+            'message' => 'You have successfully deleted the Milestone'
+        ];
+    }
+
+    /** @var CanDeleteMilestone */
+    private $canDeleteMilestone;
+
+    /** @var DeletesMilestone */
+    private $deletesMilestone;
+
+    /** @var FetchesMilestone */
+    private $fetchesMiestone;
+
+
+    /**
+     * DeleteMilestoneLogic constructor.
+     * @param CanDeleteMilestone $canDeleteMilestone
+     * @param DeletesMilestone $deletesMilestone
+     * @param FetchesMilestone $fetchesMiestone
+     */
+    public function __construct(
+        CanDeleteMilestone $canDeleteMilestone,
+        DeletesMilestone $deletesMilestone,
+        FetchesMilestone $fetchesMiestone
+    )
+    {
+        $this->canDeleteMilestone = $canDeleteMilestone;
+        $this->deletesMilestone = $deletesMilestone;
+        $this->fetchesMiestone = $fetchesMiestone;
+    }
+
+    /**
+     * @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
+    {
+
+        $query = $this->fetchesMiestone->execute(['id' => $request->route('id')]);
+        $this->canDeleteMilestone->passes();
+        $this->deletesMilestone->execute($query);
+
+        return $this->resourceResponse(new MilestoneResource($query));
+    }
+
+}
diff --git a/app/Classes/Modules/Milestones/ControllersLogic/ListMilestoneProgressLogic.php b/app/Classes/Modules/Milestones/ControllersLogic/ListMilestoneProgressLogic.php
new file mode 100644
index 00000000..55c78eb2
--- /dev/null
+++ b/app/Classes/Modules/Milestones/ControllersLogic/ListMilestoneProgressLogic.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace App\Classes\Modules\Milestones\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Milestones\Services\ListsMilestoneProgress;
+use App\Http\Resources\MilestoneProgressResource;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ListMilestoneProgressLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Retrieved Milestone Progress',
+            'message' => 'You have successfully retrieved a list of Milestone Progress'
+        ];
+    }
+
+
+    /** @var ListsMilestoneProgress */
+    private $listsMilestoneProgress;
+
+    /**
+     * ListMilestoneProgressLogic constructor.
+     * @param ListsMilestoneProgress $listsMilestoneProgress
+     */
+    public function __construct(ListsMilestoneProgress $listsMilestoneProgress)
+    {
+        $this->listsMilestoneProgress = $listsMilestoneProgress;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $query = $this->listsMilestoneProgress->execute($this->listsMilestoneProgress->deserializeFilters($request->input('filters')));
+
+        return $this->collectionResponse(MilestoneProgressResource::collection($query));
+    }
+
+}
diff --git a/app/Classes/Modules/Milestones/ControllersLogic/ListMilestonesLogic.php b/app/Classes/Modules/Milestones/ControllersLogic/ListMilestonesLogic.php
new file mode 100644
index 00000000..202041e8
--- /dev/null
+++ b/app/Classes/Modules/Milestones/ControllersLogic/ListMilestonesLogic.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace App\Classes\Modules\Milestones\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Milestones\Services\ListsMilestones;
+use App\Http\Resources\MilestoneResource;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ListMilestonesLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Retrieved Milestones',
+            'message' => 'You have successfully retrieved a list of Milestones'
+        ];
+    }
+
+
+    /** @var ListsMilestones */
+    private $listsMilestones;
+
+    /**
+     * ListMilestonesLogic constructor.
+     * @param ListsMilestones $listsMilestones
+     */
+    public function __construct(ListsMilestones $listsMilestones)
+    {
+        $this->listsMilestones = $listsMilestones;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $query = $this->listsMilestones->execute($this->listsMilestones->deserializeFilters($request->input('filters')));
+
+        return $this->collectionResponse(MilestoneResource::collection($query));
+    }
+
+}
diff --git a/app/Classes/Modules/Milestones/ControllersLogic/UpdateMilestoneLogic.php b/app/Classes/Modules/Milestones/ControllersLogic/UpdateMilestoneLogic.php
new file mode 100644
index 00000000..a7a0c655
--- /dev/null
+++ b/app/Classes/Modules/Milestones/ControllersLogic/UpdateMilestoneLogic.php
@@ -0,0 +1,73 @@
+<?php
+
+namespace App\Classes\Modules\Milestones\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Rewards\Services\FetchesReward;
+use App\Classes\Modules\Milestones\Processors\UpdateMilestoneProcessor;
+use App\Classes\Modules\Milestones\Processors\AssignRewardProcessor;
+use App\Classes\Modules\Milestones\DataTransferObjects\AchievementObject;
+use App\Http\Resources\MilestoneResource;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use App\Models\Reward;
+
+class UpdateMilestoneLogic extends AbstractControllerLogic
+{
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Update Milestone',
+            'message' => 'You have successfully updated a milestone'
+        ];
+    }
+
+    /** @var FetchesReward */
+    private $fetchesReward;
+
+    /** @var UpdateMilestoneProcessor */
+    private $updateMilestoneProcessor;
+
+    /** @var AssignRewardProcessor */
+    private $assignRewardProcessor;
+
+    /**
+     * UpdateMilestoneLogic constructor.
+     * @param UpdateMilestoneProcessor $updateMilestoneProcessor
+     * @param FetchesReward $fetchesReward
+     * @param AssignRewardProcessor $assignRewardProcessor
+     */
+    public function __construct(UpdateMilestoneProcessor $updateMilestoneProcessor, FetchesReward $fetchesReward, AssignRewardProcessor $assignRewardProcessor)
+    {
+        $this->updateMilestoneProcessor = $updateMilestoneProcessor;
+        $this->fetchesReward = $fetchesReward;
+        $this->assignRewardProcessor = $assignRewardProcessor;
+    }
+
+    /**
+     * @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
+    {
+        $milestone = $this->updateMilestoneProcessor->execute($request);
+
+        //Extra checking to make sure that each reward exists
+        $rewardIds = $request->input('reward_ids');
+        foreach ($rewardIds as $rewardId) {
+            /** @var Reward $reward */
+            $this->fetchesReward->execute(['id' => $rewardId]);
+        }
+
+        $object = new AchievementObject($milestone, $rewardIds);
+        $this->assignRewardProcessor->execute($object);
+
+        return $this->resourceResponse(new MilestoneResource($milestone));
+    }
+}
diff --git a/app/Classes/Modules/Milestones/DataTransferObjects/AchievementObject.php b/app/Classes/Modules/Milestones/DataTransferObjects/AchievementObject.php
new file mode 100644
index 00000000..c5eccfd4
--- /dev/null
+++ b/app/Classes/Modules/Milestones/DataTransferObjects/AchievementObject.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Classes\Modules\Milestones\DataTransferObjects;
+
+use App\Classes\General\Interfaces\DataTransferObject;
+use App\Models\Milestone;
+
+class AchievementObject implements DataTransferObject
+{
+    /** @var Milestone */
+    private $milestone;
+
+    /** @var array */
+    private $rewardIds;
+
+    /**
+     * AchievementObject constructor.
+     * @param Milestone $milestone
+     * @param array $reward
+     */
+    public function __construct(Milestone $milestone, array $rewardIds)
+    {
+        $this->milestone = $milestone;
+        $this->rewardIds = $rewardIds;
+    }
+
+    /**
+     * @return Milestone
+     */
+    public function getMilestone(): Milestone
+    {
+        return $this->milestone;
+    }
+
+    /**
+     * @return array
+     */
+    public function getRewardIds(): array
+    {
+        return $this->rewardIds;
+    }
+
+}
diff --git a/app/Classes/Modules/Milestones/DataTransferObjects/MilestoneObject.php b/app/Classes/Modules/Milestones/DataTransferObjects/MilestoneObject.php
new file mode 100644
index 00000000..306a0502
--- /dev/null
+++ b/app/Classes/Modules/Milestones/DataTransferObjects/MilestoneObject.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace App\Classes\Modules\Milestones\DataTransferObjects;
+
+use App\Classes\General\Interfaces\DataTransferObject;
+
+class MilestoneObject implements DataTransferObject
+{
+    /** @var int */
+    private $id;
+
+    /** @var string */
+    private $name;
+
+    /** @var string */
+    private $description;
+
+    /**
+     * MilestoneObject constructor.
+     * @param int $id
+     * @param string $name
+     * @param string $description
+     */
+    public function __construct(int $id, string $name, string $description)
+    {
+        $this->id = $id;
+        $this->name = $name;
+        $this->description = $description;
+    }
+
+    /**
+     * @return int
+     */
+    public function getId(): int
+    {
+        return $this->id;
+    }
+
+
+    /**
+     * @return string
+     */
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    /**
+     * @return string
+     */
+    public function getDescription(): string
+    {
+        return $this->description;
+    }
+}
diff --git a/app/Classes/Modules/Milestones/Processors/AssignRewardProcessor.php b/app/Classes/Modules/Milestones/Processors/AssignRewardProcessor.php
new file mode 100644
index 00000000..a76166d5
--- /dev/null
+++ b/app/Classes/Modules/Milestones/Processors/AssignRewardProcessor.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Classes\Modules\Milestones\Processors;
+
+use App\Classes\Modules\Milestones\Services\AssignsReward;
+use App\Classes\Modules\Milestones\Standards\Rules\CanAssignReward;
+use App\Classes\Modules\Milestones\DataTransferObjects\AchievementObject;
+use Illuminate\Database\Eloquent\Model;
+
+class AssignRewardProcessor
+{
+
+    /** @var CanAssignReward */
+    private $canAssignReward;
+
+    /** @var AssignsReward */
+    private $assignsReward;
+
+    /**
+     * AssignRewardProcessor constructor.
+     * @param CanAssignReward $canAssignReward
+     * @param AssignsReward $assignsReward
+     */
+    public function __construct(CanAssignReward $canAssignReward, AssignsReward $assignsReward)
+    {
+        $this->canAssignReward = $canAssignReward;
+        $this->assignsReward = $assignsReward;
+    }
+
+    /**
+     * @param AchievementObject $object
+     * @return Model
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function execute(AchievementObject $object): Model {
+
+        $this->canAssignReward->passes($object);
+
+        return $this->assignsReward->execute($object);
+    }
+
+}
diff --git a/app/Classes/Modules/Milestones/Processors/CheckMilestonesForRewardProcessor.php b/app/Classes/Modules/Milestones/Processors/CheckMilestonesForRewardProcessor.php
new file mode 100644
index 00000000..597fa8bc
--- /dev/null
+++ b/app/Classes/Modules/Milestones/Processors/CheckMilestonesForRewardProcessor.php
@@ -0,0 +1,170 @@
+<?php
+
+namespace App\Classes\Modules\Milestones\Processors;
+
+use App\Classes\Modules\Vouchers\Services\Voucherify\CreatesVoucherifyVoucher;
+use App\Classes\Modules\Vouchers\Services\CreatesVoucher;
+use App\Classes\Modules\Vouchers\Services\FetchesVoucher;
+use App\Classes\Modules\Vouchers\Services\Voucherify\FetchesVoucherifyVoucher;
+use App\Classes\Modules\Vouchers\Services\Voucherify\ValidatesVoucherifyVoucher;
+use App\Classes\Modules\Vouchers\DataTransferObjects\ValidateVoucherifyVoucherObject;
+use App\Classes\Modules\Vouchers\DataTransferObjects\VoucherObject;
+use App\Classes\Modules\Milestones\Services\FetchesMilestone;
+use App\Classes\Modules\Milestones\Services\CreatesMilestoneProgress;
+use App\Classes\Modules\Rewards\Services\CreatesUserReward;
+use App\Classes\ValueObjects\Constants\RewardType;
+use App\Models\Milestone;
+use App\Models\MilestoneProgress;
+use App\Models\Reward;
+use App\Models\User;
+use Illuminate\Support\Facades\Log;
+
+class CheckMilestonesForRewardProcessor
+{
+    /** @var CreatesVoucherifyVoucher */
+    private $createsVoucherifyVoucher;
+
+    /** @var CreatesVoucher */
+    private $createsVoucher;
+
+    /** @var CreatesMilestoneProgress */
+    private $createsMilestoneProgress;
+
+    /** @var FetchesMilestone */
+    private $fetchesMilestone;
+
+    /** @var CreatesUserReward */
+    private $createsUserReward;
+
+    /** @var FetchesVoucherifyVoucher */
+    private $fetchesVoucherifyVoucher;
+
+    /** @var FetchesVoucher */
+    private $fetchesVoucher;
+
+    /** @var ValidatesVoucherifyVoucher */
+    private $validatesVoucherifyVoucher;
+
+    /**
+     * CheckMilestonesForRewardProcessor constructor.
+     * @param CreatesVoucherifyVoucher $createsVoucherifyVoucher
+     * @param CreatesVoucher $createsVoucher
+     * @param FetchesMilestone $fetchesMilestone
+     * @param CreatesMilestoneProgress $createsMilestoneProgress
+     * @param CreatesUserReward $createsUserReward
+     * @param FetchesVoucherifyVoucher $fetchesVoucherifyVoucher
+     * @param FetchesVoucher $fetchesVoucher
+     * @param ValidatesVoucherifyVoucher $validatesVoucherifyVoucher
+    */
+    public function __construct(CreatesVoucherifyVoucher $createsVoucherifyVoucher, CreatesVoucher $createsVoucher, FetchesMilestone $fetchesMilestone, CreatesMilestoneProgress $createsMilestoneProgress, CreatesUserReward $createsUserReward, FetchesVoucherifyVoucher $fetchesVoucherifyVoucher, FetchesVoucher $fetchesVoucher, ValidatesVoucherifyVoucher $validatesVoucherifyVoucher)
+    {
+        $this->createsVoucherifyVoucher = $createsVoucherifyVoucher;
+        $this->createsVoucher = $createsVoucher;
+        $this->fetchesMilestone = $fetchesMilestone;
+        $this->createsMilestoneProgress = $createsMilestoneProgress;
+        $this->createsUserReward = $createsUserReward;
+        $this->fetchesVoucherifyVoucher = $fetchesVoucherifyVoucher;
+        $this->fetchesVoucher = $fetchesVoucher;
+        $this->validatesVoucherifyVoucher = $validatesVoucherifyVoucher;
+    }
+
+
+    /**
+     * @param User $user
+     * @param array $milestone_constants
+     * @return void
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \Voucherify\ClientException
+     */
+    public function execute(User $user, array $milestone_constants)
+    {
+        try{
+            foreach($milestone_constants as $constant)
+            {
+                 //update milestone progress
+                /** @var Milestone $milestone */
+                $milestone = $this->fetchesMilestone->execute(['name' => $constant]);
+                $result = null;
+                if($user->milestoneProgress->count() > 0){
+                    $result = $user->milestoneProgress->where('milestone_id', $milestone->id)->first();
+                }
+
+                if(!$result){
+                    $result = $this->createsMilestoneProgress->execute($milestone, $user->id);
+                }
+
+                if($result){
+                    //fetch completed miletones
+                    $completedMilestones = MilestoneProgress::where('user_id', $user->id)->pluck('milestone_id');
+                    $rewards = $milestone->rewards;
+
+                    //check for rewards that have a corresponding milestone count
+                    if(count($rewards) > 0){
+                        $this->checkMilestoneForReward($user, $completedMilestones, $rewards);
+                    }
+                }
+            }
+        } catch (\Exception $e) {
+            Log::error($e);
+        }
+    }
+
+    /**
+     * @param User $user
+     * @param object $completedMilestones
+     * @param object $rewards
+     * @return void
+     */
+    private function checkMilestoneForReward(User $user, object $completedMilestones, object $rewards)
+    {
+        $milestoneIds = $rewards[0]->milestones->pluck('id');
+        if ($milestoneIds->intersect($completedMilestones)->count() >= count($rewards[0]->milestones)) {
+            /** @var Reward $reward */
+            foreach ($rewards as $reward) {
+                $result = null;
+                if (!$user->rewards->contains('reward_id', $reward->id)) {
+                    $voucherId = 0;
+                    $voucherName = '';
+                    $voucherType = "";
+                    if($reward->type == RewardType::REWARD_AMOUNT){
+                        //Voucherify - Create Voucher
+                        $result = $this->createsVoucherifyVoucher->execute($user, intval($reward->value));
+                    }
+                    else{
+                        //Voucherify - Validates Voucher
+                        $ValidateVoucherifyVoucherObject = new ValidateVoucherifyVoucherObject(0, $reward->value, 0.00, $user);
+                        $voucherifyVoucherValidated = $this->validatesVoucherifyVoucher->execute($ValidateVoucherifyVoucherObject);
+
+                        if(!isset($voucherifyVoucherValidated->reason)){
+                            //Voucherify - Get Voucher
+                            $result = $this->fetchesVoucherifyVoucher->execute($user, $reward->value);
+                        }
+                    }
+
+                    if($result && !isset($result->reason)){
+                        $voucherName = isset($result->campaign) ? $result->campaign : $reward->name;
+                        $voucherType = $result->discount->type;
+                        $voucherValue = isset($result->discount->amount_off) ? $result->discount->amount_off : $result->discount->percent_off;
+                        $voucherStartDate = $result->start_date;
+                        $voucherEndDate = $result->expiration_date;
+
+                        //create voucher
+                        $voucherObject = new VoucherObject($result->code, isset($voucherName) ? $voucherName : "", $voucherType, $voucherValue, $voucherStartDate, $voucherEndDate);
+                        $voucher = $this->createsVoucher->execute($voucherObject);
+                        if(!$voucher) $voucher = $this->fetchesVoucher->execute(['code' => $voucherObject->getCode()]);
+                        $voucherId = $voucher->id;
+
+                        //create reward to user (user_reward)
+                        $voucherCount = $user->rewards->where('voucher_id', $voucher->id)->count();
+                        if($voucherCount == 0){
+                            $this->createsUserReward->execute($reward, $user, $voucherId);
+                        }
+                    }
+                    else{
+                        Log::info('CheckMilestonesForRewardProcessor: no voucher fetched or created for reward '. json_encode($reward));
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/app/Classes/Modules/Milestones/Processors/CreateMilestoneProcessor.php b/app/Classes/Modules/Milestones/Processors/CreateMilestoneProcessor.php
new file mode 100644
index 00000000..3c562d8d
--- /dev/null
+++ b/app/Classes/Modules/Milestones/Processors/CreateMilestoneProcessor.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Classes\Modules\Milestones\Processors;
+
+use App\Classes\Modules\Milestones\DataTransferObjects\MilestoneObject;
+use App\Classes\Modules\Milestones\Services\CreatesMilestone;
+use App\Classes\Modules\Milestones\Standards\Rules\CanCreateMilestone;
+use Illuminate\Http\Request;
+use Illuminate\Database\Eloquent\Model;
+
+class CreateMilestoneProcessor
+{
+    /** @var CreatesMilestone */
+    private $createsMilestone;
+
+    /** @var CanCreateMilestone */
+    private $canCreateMilestone;
+
+    /**
+     * CreateMilestoneProcessor constructor.
+     * @param CreatesMilestone $createsMilestone
+     * @param CanCreateMilestone $canCreateMilestone
+     */
+    public function __construct(CanCreateMilestone $canCreateMilestone, CreatesMilestone $createsMilestone)
+    {
+        $this->canCreateMilestone = $canCreateMilestone;
+        $this->createsMilestone = $createsMilestone;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return Model
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function execute(Request $request): Model
+    {
+        $userMilestoneObject = new MilestoneObject(
+            $request->input('id'),
+            $request->input('name'),
+            $request->input('description')
+        );
+
+        $this->canCreateMilestone->passes($userMilestoneObject);
+
+        return $this->createsMilestone->execute($userMilestoneObject);
+    }
+
+}
diff --git a/app/Classes/Modules/Milestones/Processors/UpdateMilestoneProcessor.php b/app/Classes/Modules/Milestones/Processors/UpdateMilestoneProcessor.php
new file mode 100644
index 00000000..b1fdbc14
--- /dev/null
+++ b/app/Classes/Modules/Milestones/Processors/UpdateMilestoneProcessor.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace App\Classes\Modules\Milestones\Processors;
+
+use App\Classes\Modules\Milestones\DataTransferObjects\MilestoneObject;
+use App\Classes\Modules\Milestones\Services\FetchesMilestone;
+use App\Classes\Modules\Milestones\Services\UpdatesMilestone;
+use App\Classes\Modules\Milestones\Standards\Rules\CanUpdateMilestone;
+use Illuminate\Http\Request;
+use Illuminate\Database\Eloquent\Model;
+
+class UpdateMilestoneProcessor
+{
+    /** @var UpdatesMilestone */
+    private $updatesMilestone;
+
+    /** @var FetchesMilestone */
+    private $fetchesMilestone;
+
+    /** @var CanUpdateMilestone */
+    private $canUpdateMilestone;
+
+    /**
+     * UpdateMilestoneProcessor constructor.
+     * @param UpdatesMilestone $updatesMilestone
+     * @param FetchesMilestone $fetchesMilestone
+     * @param CanUpdateMilestone $canUpdateMilestone
+     */
+    public function __construct(CanUpdateMilestone $canUpdateMilestone, UpdatesMilestone $updatesMilestone, FetchesMilestone $fetchesMilestone)
+    {
+        $this->canUpdateMilestone = $canUpdateMilestone;
+        $this->updatesMilestone = $updatesMilestone;
+        $this->fetchesMilestone = $fetchesMilestone;
+    }
+
+
+    /**
+     * @param Request $request
+     * @return Model
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function execute(Request $request): Model
+    {
+        $milestoneObject = new MilestoneObject(
+            $request->input('id'),
+            $request->input('name'),
+            $request->input('description')
+        );
+
+        $this->canUpdateMilestone->passes($milestoneObject);
+
+        $milestone = $this->fetchesMilestone->execute(['id' => $request->route('id')]);
+
+        return $this->updatesMilestone->execute($milestone, $milestoneObject);
+    }
+
+}
diff --git a/app/Classes/Modules/Milestones/Services/AssignsReward.php b/app/Classes/Modules/Milestones/Services/AssignsReward.php
new file mode 100644
index 00000000..4d50a89e
--- /dev/null
+++ b/app/Classes/Modules/Milestones/Services/AssignsReward.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Classes\Modules\Milestones\Services;
+
+use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\Modules\Milestones\DataTransferObjects\AchievementObject;
+use Illuminate\Database\QueryException;
+
+class AssignsReward extends AbstractUpdateRecord
+{
+    /**
+     * @param AchievementObject $object
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws MalformedRequestException
+     */
+    public function execute(AchievementObject $object)
+    {
+        try {
+            // $object->getMilestone()->rewards()->attach($object->getReward()->id);
+            $object->getMilestone()->rewards()->sync($object->getRewardIds());
+
+            return $object->getMilestone();
+
+        } catch (QueryException $exception){
+            throw new MalformedRequestException($exception);
+        }
+    }
+}
diff --git a/app/Classes/Modules/Milestones/Services/CheckIfMilestoneProgressExists.php b/app/Classes/Modules/Milestones/Services/CheckIfMilestoneProgressExists.php
new file mode 100644
index 00000000..f6b73820
--- /dev/null
+++ b/app/Classes/Modules/Milestones/Services/CheckIfMilestoneProgressExists.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Classes\Modules\Milestones\Services;
+
+use App\Models\MilestoneProgress;
+
+class CheckIfMilestoneProgressExists
+{
+
+    /** @var MilestoneProgress */
+    private $repository;
+
+
+    /**
+     * CheckIfMilestoneProgressExists constructor.
+     * @param MilestoneProgress $repository
+     */
+    public function __construct(MilestoneProgress $repository)
+    {
+        $this->repository = $repository;
+    }
+
+    public function execute(int $user_id, int $milestone_id): bool {
+        return $this->repository->where('user_id', $user_id)->where('milestone_id', $milestone_id)->exists();
+    }
+
+}
diff --git a/app/Classes/Modules/Milestones/Services/CreatesMilestone.php b/app/Classes/Modules/Milestones/Services/CreatesMilestone.php
new file mode 100644
index 00000000..9ec9e2d1
--- /dev/null
+++ b/app/Classes/Modules/Milestones/Services/CreatesMilestone.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Classes\Modules\Milestones\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\Modules\Milestones\DataTransferObjects\MilestoneObject;
+use App\Models\Milestone;
+
+class CreatesMilestone extends AbstractUpdateRecord
+{
+    /**
+     * @param MilestoneObject $object
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function execute(MilestoneObject $object) {
+        $model = new Milestone();
+        $model->name = $object->getName();
+        $model->description = $object->getDescription();
+
+        return $this->handler($model);
+    }
+}
diff --git a/app/Classes/Modules/Milestones/Services/CreatesMilestoneProgress.php b/app/Classes/Modules/Milestones/Services/CreatesMilestoneProgress.php
new file mode 100644
index 00000000..bd04c624
--- /dev/null
+++ b/app/Classes/Modules/Milestones/Services/CreatesMilestoneProgress.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Classes\Modules\Milestones\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
+use App\Models\Milestone;
+use App\Models\MilestoneProgress;
+
+class CreatesMilestoneProgress extends AbstractUpdateRelationshipRecord
+{
+    /** @var CheckIfMilestoneProgressExists */
+    private $isMilestoneProgressExists;
+
+    /**
+     * CreatesMilestoneProgress constructor.
+     * @param CheckIfMilestoneProgressExists $isMilestoneProgressExists
+     */
+    public function __construct(CheckIfMilestoneProgressExists $isMilestoneProgressExists)
+    {
+        $this->isMilestoneProgressExists = $isMilestoneProgressExists;
+    }
+
+
+    /**
+     * @param Milestone $milestone
+     * @param string $userId
+     * @return \Illuminate\Database\Eloquent\Model|null
+     */
+    public function execute(Milestone $milestone, string $userId) {
+        if(!$this->isMilestoneProgressExists->execute($userId, $milestone->id))
+        {
+            $model = new MilestoneProgress();
+            $model->user_id = $userId;
+
+            return $this->handler($milestone->progress(), $model);
+        }
+
+        return null;
+    }
+}
diff --git a/app/Classes/Modules/Milestones/Services/DeletesMilestone.php b/app/Classes/Modules/Milestones/Services/DeletesMilestone.php
new file mode 100644
index 00000000..f829d8e1
--- /dev/null
+++ b/app/Classes/Modules/Milestones/Services/DeletesMilestone.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Classes\Modules\Milestones\Services;
+
+use App\Classes\General\Eloquent\AbstractDeleteRecord;
+use App\Models\Milestone;
+
+class DeletesMilestone extends AbstractDeleteRecord
+{
+
+    /**
+     * @param Milestone $model
+     * @return mixed
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Milestone $model) {
+        return $this->handler($model);
+    }
+}
diff --git a/app/Classes/Modules/Milestones/Services/FetchesMilestone.php b/app/Classes/Modules/Milestones/Services/FetchesMilestone.php
new file mode 100644
index 00000000..e0c12881
--- /dev/null
+++ b/app/Classes/Modules/Milestones/Services/FetchesMilestone.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Classes\Modules\Milestones\Services;
+
+
+use App\Classes\General\Eloquent\AbstractFetchRecord;
+use Illuminate\Database\Eloquent\Builder;
+use App\Models\Milestone;
+
+class FetchesMilestone extends AbstractFetchRecord
+{
+
+    /** @var Milestone */
+    private $repository;
+
+
+    /**
+     * FetchesMilestone constructor.
+     * @param Milestone $repository
+     */
+    public function __construct(Milestone $repository)
+    {
+        $this->repository = $repository;
+    }
+
+
+    /**
+     * @return Builder
+     */
+    public function getRepository(): Builder
+    {
+        return $this->repository->newQuery();
+    }
+}
diff --git a/app/Classes/Modules/Milestones/Services/ListsMilestoneProgress.php b/app/Classes/Modules/Milestones/Services/ListsMilestoneProgress.php
new file mode 100644
index 00000000..2cdf6de2
--- /dev/null
+++ b/app/Classes/Modules/Milestones/Services/ListsMilestoneProgress.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Classes\Modules\Milestones\Services;
+
+
+use App\Classes\General\Eloquent\AbstractListRecord;
+use Illuminate\Database\Eloquent\Builder;
+use App\Models\MilestoneProgress;
+
+class ListsMilestoneProgress extends AbstractListRecord
+{
+
+    /** @var MilestoneProgress */
+    private $repository;
+
+    /**
+     * ListsMilestoneProgress constructor.
+     * @param MilestoneProgress $repository
+     */
+    public function __construct(MilestoneProgress $repository)
+    {
+        $this->repository = $repository;
+    }
+
+
+    /**
+     * @return Builder
+     */
+    function getRepository(): Builder
+    {
+        return $this->repository->newQuery();
+    }
+}
diff --git a/app/Classes/Modules/Milestones/Services/ListsMilestones.php b/app/Classes/Modules/Milestones/Services/ListsMilestones.php
new file mode 100644
index 00000000..dae7c076
--- /dev/null
+++ b/app/Classes/Modules/Milestones/Services/ListsMilestones.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Classes\Modules\Milestones\Services;
+
+
+use App\Classes\General\Eloquent\AbstractListRecord;
+use Illuminate\Database\Eloquent\Builder;
+use App\Models\Milestone;
+
+class ListsMilestones extends AbstractListRecord
+{
+
+    /** @var Milestone */
+    private $repository;
+
+    /**
+     * ListsMilestones constructor.
+     * @param Milestone $repository
+     */
+    public function __construct(Milestone $repository)
+    {
+        $this->repository = $repository;
+    }
+
+
+    /**
+     * @return Builder
+     */
+    function getRepository(): Builder
+    {
+        return $this->repository->newQuery();
+    }
+}
diff --git a/app/Classes/Modules/Milestones/Services/UpdatesMilestone.php b/app/Classes/Modules/Milestones/Services/UpdatesMilestone.php
new file mode 100644
index 00000000..fbe463aa
--- /dev/null
+++ b/app/Classes/Modules/Milestones/Services/UpdatesMilestone.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Classes\Modules\Milestones\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\Modules\Milestones\DataTransferObjects\MilestoneObject;
+use App\Models\Milestone;
+
+class UpdatesMilestone extends AbstractUpdateRecord
+{
+    /**
+     * @param Milestone $model
+     * @param MilestoneObject $object
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Milestone $model, MilestoneObject $object)
+    {
+        $model->name = $object->getName();
+        $model->description = $object->getDescription();
+
+        return $this->handler($model);
+    }
+}
diff --git a/app/Classes/Modules/Milestones/Standards/Rules/CanAssignReward.php b/app/Classes/Modules/Milestones/Standards/Rules/CanAssignReward.php
new file mode 100644
index 00000000..35e8b31d
--- /dev/null
+++ b/app/Classes/Modules/Milestones/Standards/Rules/CanAssignReward.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace App\Classes\Modules\Milestones\Standards\Rules;
+
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Milestones\Standards\Validators\MilestoneRewardValidation;
+use App\Classes\Modules\Milestones\DataTransferObjects\AchievementObject;
+use Illuminate\Support\Facades\Auth;
+
+class CanAssignReward extends AbstractRule
+{
+
+    /** @var MilestoneRewardValidation */
+    private $milestoneRewardValidation;
+
+
+    /**
+     * CanAssignReward constructor.
+     * @param MilestoneRewardValidation $milestoneRewardValidation
+     */
+    public function __construct(MilestoneRewardValidation $milestoneRewardValidation)
+    {
+        $this->milestoneRewardValidation = $milestoneRewardValidation;
+    }
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        if (!Auth::user()->can('edit milestone')) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * @param AchievementObject $object
+     * @return bool
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    protected function validators($object): bool
+    {
+        return $this->milestoneRewardValidation->validate($object);
+    }
+
+    /**
+     * @param AchievementObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}
diff --git a/app/Classes/Modules/Milestones/Standards/Rules/CanCreateMilestone.php b/app/Classes/Modules/Milestones/Standards/Rules/CanCreateMilestone.php
new file mode 100644
index 00000000..be25b64f
--- /dev/null
+++ b/app/Classes/Modules/Milestones/Standards/Rules/CanCreateMilestone.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Classes\Modules\Milestones\Standards\Rules;
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Milestones\Standards\Validators\MilestoneValidation;
+use App\Classes\Modules\Milestones\DataTransferObjects\MilestoneObject;
+use Illuminate\Support\Facades\Auth;
+
+class CanCreateMilestone extends AbstractRule
+{
+
+    /** @var MilestoneValidation */
+    private $milestoneValidation;
+
+    /**
+     * CanCreateMilestone constructor.
+     * @param MilestoneValidation $milestoneValidation
+     */
+    public function __construct(MilestoneValidation $milestoneValidation)
+    {
+        $this->milestoneValidation = $milestoneValidation;
+    }
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        if (!Auth::user()->can('add milestone')) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * @param MilestoneObject $object
+     * @return bool
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    protected function validators($object): bool
+    {
+        return $this->milestoneValidation->validate($object, 'POST');
+    }
+
+    /**
+     * @param MilestoneObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+}
diff --git a/app/Classes/Modules/Milestones/Standards/Rules/CanDeleteMilestone.php b/app/Classes/Modules/Milestones/Standards/Rules/CanDeleteMilestone.php
new file mode 100644
index 00000000..c0c7fde7
--- /dev/null
+++ b/app/Classes/Modules/Milestones/Standards/Rules/CanDeleteMilestone.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Classes\Modules\Milestones\Standards\Rules;
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Milestones\DataTransferObjects\MilestoneObject;
+use Illuminate\Support\Facades\Auth;
+
+class CanDeleteMilestone extends AbstractRule
+{
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        if (!Auth::user()->can('delete milestone')) {
+            return false;
+        }
+
+        return true;
+
+    }
+
+    /**
+     * @param MilestoneObject $object
+     * @return bool
+     */
+    protected function validators($object): bool
+    {
+        return true;
+
+    }
+
+
+    /**
+     * @param MilestoneObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}
diff --git a/app/Classes/Modules/Milestones/Standards/Rules/CanUpdateMilestone.php b/app/Classes/Modules/Milestones/Standards/Rules/CanUpdateMilestone.php
new file mode 100644
index 00000000..9f7db714
--- /dev/null
+++ b/app/Classes/Modules/Milestones/Standards/Rules/CanUpdateMilestone.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Classes\Modules\Milestones\Standards\Rules;
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Milestones\DataTransferObjects\MilestoneObject;
+use App\Classes\Modules\Milestones\Standards\Validators\MilestoneValidation;
+use Illuminate\Support\Facades\Auth;
+
+class CanUpdateMilestone extends AbstractRule
+{
+    /** @var MilestoneValidation */
+    private $milestoneValidation;
+
+
+    /**
+     * CanUpdateMilestone constructor.
+     * @param MilestoneValidation $milestoneValidation
+     */
+    public function __construct(MilestoneValidation $milestoneValidation)
+    {
+        $this->milestoneValidation = $milestoneValidation;
+    }
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        if (!Auth::user()->can('edit milestone')) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * @param MilestoneObject $object
+     * @return bool
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    protected function validators($object): bool
+    {
+        return $this->milestoneValidation->validate($object, 'PUT');
+    }
+
+    /**
+     * @param MilestoneObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+}
diff --git a/app/Classes/Modules/Milestones/Standards/Validators/MilestoneRewardValidation.php b/app/Classes/Modules/Milestones/Standards/Validators/MilestoneRewardValidation.php
new file mode 100644
index 00000000..a282b010
--- /dev/null
+++ b/app/Classes/Modules/Milestones/Standards/Validators/MilestoneRewardValidation.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace App\Classes\Modules\Milestones\Standards\Validators;
+
+use App\Classes\General\Abstracts\AbstractValidation;
+use App\Classes\Modules\Milestones\DataTransferObjects\AchievementObject;
+
+class MilestoneRewardValidation extends AbstractValidation
+{
+    /**
+     * @param AchievementObject $object
+     * @return array
+     */
+    protected function data($object): array
+    {
+        return [
+            'milestone_id' => $object->getMilestone()->id,
+            'reward_ids' => $object->getRewardIds()
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    protected function rules(): array
+    {
+        return [
+            'milestone_id' => 'required',
+            'reward_ids' => 'required',
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    protected function messages(): array
+    {
+        return [];
+    }
+}
diff --git a/app/Classes/Modules/Milestones/Standards/Validators/MilestoneValidation.php b/app/Classes/Modules/Milestones/Standards/Validators/MilestoneValidation.php
new file mode 100644
index 00000000..81ffbced
--- /dev/null
+++ b/app/Classes/Modules/Milestones/Standards/Validators/MilestoneValidation.php
@@ -0,0 +1,68 @@
+<?php
+
+namespace App\Classes\Modules\Milestones\Standards\Validators;
+
+
+use App\Classes\General\Abstracts\AbstractValidation;
+use App\Classes\Modules\Milestones\DataTransferObjects\MilestoneObject;
+use App\Models\Milestone;
+
+class MilestoneValidation extends AbstractValidation
+{
+    /**
+     * @param MilestoneObject $object
+     * @return array
+     */
+    protected function data($object): array {
+
+        $data = [
+            'name'=> $object->getName(),
+            'description' => $object->getDescription(),
+        ];
+
+        return $data;
+    }
+
+    /**
+     * @param null|string $type
+     * @return array
+     */
+    protected function rules(?string $type = 'POST'): array {
+        if ($type == 'POST') { //crete
+            return [
+                'name' => [
+                    'required',
+                    function ($attribute, $value, $fail) {
+                        // Check if milestone name already exists in the database
+                        $existingMilestone = Milestone::where('name', $value)->first();
+                        if ($existingMilestone) {
+                            $fail("The {$attribute} milestone name already exists in the database.");
+                        }
+                    },
+                ],
+                'description' => [
+                    'required',
+                ]
+            ];
+
+        }
+        elseif($type == 'PUT') { //update
+            return [
+                'name' => [
+                    'required',
+                ],
+                'description' => [
+                    'required',
+                ]
+            ];
+        }
+    }
+
+    /**
+     * @return array
+     */
+    protected function messages(): array {
+        return [];
+    }
+
+}
diff --git a/app/Classes/Modules/PerfexCRM/Services/FetchesPerfexCRMTask.php b/app/Classes/Modules/PerfexCRM/Services/FetchesPerfexCRMTask.php
index acdf1a89..78b61bd6 100644
--- a/app/Classes/Modules/PerfexCRM/Services/FetchesPerfexCRMTask.php
+++ b/app/Classes/Modules/PerfexCRM/Services/FetchesPerfexCRMTask.php
@@ -39,8 +39,7 @@ class FetchesPerfexCRMTask
 
                 return (object) $data;
             }else{
-                // Log::error($response);
-                Helper::debugLoggerForPerfexCRM($response);
+                Helper::debugLogger($response);
                 return null;
             }
         }catch(\Exception $exception){
diff --git a/app/Classes/Modules/PerfexCRM/Services/UpdatesPerfexCRMCustomer.php b/app/Classes/Modules/PerfexCRM/Services/UpdatesPerfexCRMCustomer.php
index 27ff3165..6d91c081 100644
--- a/app/Classes/Modules/PerfexCRM/Services/UpdatesPerfexCRMCustomer.php
+++ b/app/Classes/Modules/PerfexCRM/Services/UpdatesPerfexCRMCustomer.php
@@ -38,8 +38,7 @@ class UpdatesPerfexCRMCustomer
                 $data = $response->json();
                 return (object) $data;
             }else{
-                // Log::error($response);
-                Helper::debugLoggerForPerfexCRM($response);
+                Helper::debugLogger($response);
                 return null;
             }
         }catch(\Exception $exception){
diff --git a/app/Classes/Modules/Rewards/ControllersLogic/CreateRewardLogic.php b/app/Classes/Modules/Rewards/ControllersLogic/CreateRewardLogic.php
new file mode 100644
index 00000000..dc6fecf2
--- /dev/null
+++ b/app/Classes/Modules/Rewards/ControllersLogic/CreateRewardLogic.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace App\Classes\Modules\Rewards\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Rewards\Services\CreatesReward;
+use App\Classes\Modules\Rewards\DataTransferObjects\RewardObject;
+use App\Classes\Modules\Rewards\Standards\Rules\CanCreateReward;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreateRewardLogic extends AbstractControllerLogic
+{
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Create/Update Reward',
+            'message' => 'You have successfully created/updated a reward'
+        ];
+    }
+
+    /** @var CreatesReward */
+    private $createsReward;
+
+    /** @var CanCreateReward */
+    private $canCreateReward;
+
+    /**
+     * CreateRewardLogic constructor.
+     */
+    public function __construct(CreatesReward $createsMilestone, CanCreateReward $canCreateReward)
+    {
+        $this->createsReward = $createsMilestone;
+        $this->canCreateReward = $canCreateReward;
+    }
+
+    /**
+     * @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
+    {
+        $userRewardObject = new RewardObject(
+            $request->input('id'),
+            $request->input('name'),
+            $request->input('description'),
+            $request->input('value'),
+            $request->input('type'),
+            $request->input('is_active'),
+            $request->input('order'),
+        );
+
+        $this->canCreateReward->passes($userRewardObject);
+
+        $result = $this->createsReward->execute($userRewardObject);
+
+        return $this->response(['data' => $result]);
+    }
+
+
+}
diff --git a/app/Classes/Modules/Rewards/ControllersLogic/DeleteRewardLogic.php b/app/Classes/Modules/Rewards/ControllersLogic/DeleteRewardLogic.php
new file mode 100644
index 00000000..6b2c306c
--- /dev/null
+++ b/app/Classes/Modules/Rewards/ControllersLogic/DeleteRewardLogic.php
@@ -0,0 +1,74 @@
+<?php
+
+namespace App\Classes\Modules\Rewards\ControllersLogic;
+
+use App\Http\Resources\RewardResource;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+
+use App\Classes\Modules\Rewards\Services\FetchesReward;
+
+use App\Classes\Modules\Rewards\Standards\Rules\CanDeleteReward;
+use App\Classes\Modules\Rewards\Services\DeletesReward;
+
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class DeleteRewardLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Delete Reward',
+            'message' => 'You have successfully deleted the Reward'
+        ];
+    }
+
+    /** @var CanDeleteReward */
+    private $canDeleteReward;
+
+    /** @var DeletesReward */
+    private $deletesReward;
+
+    /** @var FetchesReward */
+    private $fetchesReward;
+
+
+    /**
+     * DeleteRewardLogic constructor.
+     * @param CanDeleteReward $canDeleteReward
+     * @param DeletesReward $deletesReward
+     * @param FetchesReward $fetchesReward
+     */
+    public function __construct(
+        CanDeleteReward $canDeleteReward,
+        DeletesReward $deletesReward,
+        FetchesReward $fetchesReward
+    )
+    {
+        $this->canDeleteReward = $canDeleteReward;
+        $this->deletesReward = $deletesReward;
+        $this->fetchesReward = $fetchesReward;
+    }
+
+    /**
+     * @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
+    {
+
+        $query = $this->fetchesReward->execute(['id' => $request->route('id')]);
+        $this->canDeleteReward->passes();
+        $this->deletesReward->execute($query);
+
+        return $this->resourceResponse(new RewardResource($query));
+    }
+
+}
diff --git a/app/Classes/Modules/Rewards/ControllersLogic/ListRewardsDetailsLogic.php b/app/Classes/Modules/Rewards/ControllersLogic/ListRewardsDetailsLogic.php
new file mode 100644
index 00000000..0f3cfda8
--- /dev/null
+++ b/app/Classes/Modules/Rewards/ControllersLogic/ListRewardsDetailsLogic.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace App\Classes\Modules\Rewards\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Rewards\Services\ListsRewards;
+use App\Http\Resources\RewardDetailsResource;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ListRewardsDetailsLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Retrieved Rewards Details',
+            'message' => 'You have successfully retrieved a list of Rewards Details'
+        ];
+    }
+
+    /** @var ListsRewards */
+    private $listsRewards;
+
+    /**
+     * ListRewardsDetailsLogic constructor.
+     * @param ListsRewards $listsRewards
+     */
+    public function __construct(ListsRewards $listsRewards)
+    {
+        $this->listsRewards = $listsRewards;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $query = $this->listsRewards->execute($this->listsRewards->deserializeFilters($request->input('filters')));
+
+        return $this->collectionResponse(RewardDetailsResource::collection($query));
+    }
+
+}
diff --git a/app/Classes/Modules/Rewards/ControllersLogic/ListRewardsLogic.php b/app/Classes/Modules/Rewards/ControllersLogic/ListRewardsLogic.php
new file mode 100644
index 00000000..593947e6
--- /dev/null
+++ b/app/Classes/Modules/Rewards/ControllersLogic/ListRewardsLogic.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace App\Classes\Modules\Rewards\ControllersLogic;
+
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Rewards\Services\ListsRewards;
+use App\Http\Resources\RewardResource;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ListRewardsLogic extends AbstractControllerLogic
+{
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Retrieved Rewards',
+            'message' => 'You have successfully retrieved a list of Rewards'
+        ];
+    }
+
+
+    /** @var ListsRewards */
+    private $listsRewards;
+
+    /**
+     * ListRewardsLogic constructor.
+     * @param ListsRewards $listsRewards
+     */
+    public function __construct(ListsRewards $listsRewards)
+    {
+        $this->listsRewards = $listsRewards;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $query = $this->listsRewards->execute($this->listsRewards->deserializeFilters($request->input('filters')));
+
+        return $this->collectionResponse(RewardResource::collection($query));
+    }
+
+}
diff --git a/app/Classes/Modules/Rewards/DataTransferObjects/RewardObject.php b/app/Classes/Modules/Rewards/DataTransferObjects/RewardObject.php
new file mode 100644
index 00000000..45092222
--- /dev/null
+++ b/app/Classes/Modules/Rewards/DataTransferObjects/RewardObject.php
@@ -0,0 +1,106 @@
+<?php
+
+namespace App\Classes\Modules\Rewards\DataTransferObjects;
+
+use App\Classes\General\Interfaces\DataTransferObject;
+
+class RewardObject implements DataTransferObject
+{
+    /** @var int */
+    private $id;
+
+    /** @var string */
+    private $name;
+
+    /** @var string */
+    private $description;
+
+    /** @var string */
+    private $value;
+
+    /** @var string */
+    private $type;
+
+    /** @var bool */
+    private $isActive;
+
+    /** @var int */
+    private $order;
+
+    /**
+     * RewardObject constructor.
+     * @param int $id
+     * @param string $name
+     * @param string $description
+     * @param string $value
+     * @param string $type
+     * @param bool $isActive
+     * @param int $order
+     */
+    public function __construct(int $id, string $name, string $description, string $value, string $type, bool $isActive = true, ?int $order = 9999)
+    {
+        $this->id = $id;
+        $this->name = $name;
+        $this->description = $description;
+        $this->value = $value;
+        $this->type = $type;
+        $this->isActive = $isActive;
+        $this->order = $order;
+    }
+
+    /**
+     * @return int
+     */
+    public function getId(): int
+    {
+        return $this->id;
+    }
+
+    /**
+     * @return string
+     */
+    public function getName(): string
+    {
+        return $this->name;
+    }
+
+    /**
+     * @return string
+     */
+    public function getDescription(): string
+    {
+        return $this->description;
+    }
+
+    /**
+     * @return string
+     */
+    public function getValue(): string
+    {
+        return $this->value;
+    }
+
+    /**
+     * @return string
+     */
+    public function getType(): string
+    {
+        return $this->type;
+    }
+
+    /**
+     * @return bool
+     */
+    public function getIsActive(): bool
+    {
+        return $this->isActive;
+    }
+
+    /**
+     * @return int
+     */
+    public function getOrder(): int
+    {
+        return $this->order ?? 9999;
+    }
+}
diff --git a/app/Classes/Modules/Rewards/Services/CreatesReward.php b/app/Classes/Modules/Rewards/Services/CreatesReward.php
new file mode 100644
index 00000000..c9a16fdc
--- /dev/null
+++ b/app/Classes/Modules/Rewards/Services/CreatesReward.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace App\Classes\Modules\Rewards\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRecord;
+use App\Classes\Modules\Rewards\DataTransferObjects\RewardObject;
+use App\Models\Reward;
+use App\Classes\Exceptions\MalformedRequestException;
+use Illuminate\Database\QueryException;
+
+class CreatesReward extends AbstractUpdateRecord
+{
+    /**
+     * @param RewardObject $object
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(RewardObject $object) {
+
+        // $model = new Reward();
+        // $model->name = $object->getName();
+        // $model->description = $object->getDescription();
+        // $model->value = $object->getValue();
+        // $model->type = $object->getType();
+        // $model->is_active = $object->getIsActive();
+        // return $this->handler($model);
+
+        try{
+            $data = [
+                'id' => $object->getId(),
+                'name' => $object->getName(),
+                'description' => $object->getDescription(),
+                'value' => $object->getValue(),
+                'type' => $object->getType(),
+                'is_active' => $object->getIsActive(),
+                'order' => $object->getOrder(),
+            ];
+
+            return Reward::upsert([$data], ['id'], ['name', 'description', 'value', 'type', 'is_active', 'order']);
+
+        } catch (QueryException $exception){
+            throw new MalformedRequestException($exception);
+        }
+    }
+}
diff --git a/app/Classes/Modules/Rewards/Services/CreatesUserReward.php b/app/Classes/Modules/Rewards/Services/CreatesUserReward.php
new file mode 100644
index 00000000..8a7f5d29
--- /dev/null
+++ b/app/Classes/Modules/Rewards/Services/CreatesUserReward.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Classes\Modules\Rewards\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
+use App\Models\Reward;
+use App\Models\User;
+use App\Models\UserReward;
+
+class CreatesUserReward extends AbstractUpdateRelationshipRecord
+{
+    /**
+     * @param Reward $reward
+     * @param User $user
+     * @param int $voucherId
+     * @return \Illuminate\Database\Eloquent\Model|null
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(?Reward $reward, User $user, int $voucherId) {
+        if($reward){
+            $model = new UserReward();
+            $model->user_id = $user->id;
+            $model->voucher_id = $voucherId;
+            return $this->handler($reward->users(), $model);
+        }
+        else{
+            $model = new UserReward();
+            $model->voucher_id = $voucherId;
+            return $this->handler($user->rewards(), $model);
+        }
+    }
+}
diff --git a/app/Classes/Modules/Rewards/Services/DeletesReward.php b/app/Classes/Modules/Rewards/Services/DeletesReward.php
new file mode 100644
index 00000000..5d3d9133
--- /dev/null
+++ b/app/Classes/Modules/Rewards/Services/DeletesReward.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Classes\Modules\Rewards\Services;
+
+use App\Classes\General\Eloquent\AbstractDeleteRecord;
+use App\Models\Reward;
+
+class DeletesReward extends AbstractDeleteRecord
+{
+
+    /**
+     * @param Reward $model
+     * @return mixed
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Reward $model) {
+        return $this->handler($model);
+    }
+}
diff --git a/app/Classes/Modules/Rewards/Services/FetchesReward.php b/app/Classes/Modules/Rewards/Services/FetchesReward.php
new file mode 100644
index 00000000..ab336092
--- /dev/null
+++ b/app/Classes/Modules/Rewards/Services/FetchesReward.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Classes\Modules\Rewards\Services;
+
+
+use App\Classes\General\Eloquent\AbstractFetchRecord;
+use Illuminate\Database\Eloquent\Builder;
+use App\Models\Reward;
+
+class FetchesReward extends AbstractFetchRecord
+{
+
+    /** @var Reward */
+    private $repository;
+
+
+    /**
+     * FetchesReward constructor.
+     * @param Reward $repository
+     */
+    public function __construct(Reward $repository)
+    {
+        $this->repository = $repository;
+    }
+
+
+    /**
+     * @return Builder
+     */
+    public function getRepository(): Builder
+    {
+        return $this->repository->newQuery();
+    }
+}
diff --git a/app/Classes/Modules/Rewards/Services/ListsRewards.php b/app/Classes/Modules/Rewards/Services/ListsRewards.php
new file mode 100644
index 00000000..79d0d1d4
--- /dev/null
+++ b/app/Classes/Modules/Rewards/Services/ListsRewards.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Classes\Modules\Rewards\Services;
+
+
+use App\Classes\General\Eloquent\AbstractListRecord;
+use Illuminate\Database\Eloquent\Builder;
+use App\Models\Reward;
+
+class ListsRewards extends AbstractListRecord
+{
+
+    /** @var Reward */
+    private $repository;
+
+    /**
+     * ListsRewards constructor.
+     * @param Reward $repository
+     */
+    public function __construct(Reward $repository)
+    {
+        $this->repository = $repository;
+    }
+
+
+    /**
+     * @return Builder
+     */
+    function getRepository(): Builder
+    {
+        return $this->repository->newQuery();
+    }
+}
diff --git a/app/Classes/Modules/Rewards/Services/ListsUserRewards.php b/app/Classes/Modules/Rewards/Services/ListsUserRewards.php
new file mode 100644
index 00000000..d81761cd
--- /dev/null
+++ b/app/Classes/Modules/Rewards/Services/ListsUserRewards.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Classes\Modules\Rewards\Services;
+
+
+use App\Classes\General\Eloquent\AbstractListRecord;
+use Illuminate\Database\Eloquent\Builder;
+use App\Models\UserReward;
+
+class ListsUserRewards extends AbstractListRecord
+{
+
+    /** @var UserReward */
+    private $repository;
+
+    /**
+     * ListsUserRewards constructor.
+     * @param UserReward $repository
+     */
+    public function __construct(UserReward $repository)
+    {
+        $this->repository = $repository;
+    }
+
+
+    /**
+     * @return Builder
+     */
+    function getRepository(): Builder
+    {
+        return $this->repository->newQuery();
+    }
+}
diff --git a/app/Classes/Modules/Rewards/Standards/Rules/CanCreateReward.php b/app/Classes/Modules/Rewards/Standards/Rules/CanCreateReward.php
new file mode 100644
index 00000000..5249b35c
--- /dev/null
+++ b/app/Classes/Modules/Rewards/Standards/Rules/CanCreateReward.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace App\Classes\Modules\Rewards\Standards\Rules;
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Rewards\Standards\Validators\RewardValidation;
+use App\Classes\Modules\Rewards\DataTransferObjects\RewardObject;
+use Illuminate\Support\Facades\Auth;
+
+class CanCreateReward extends AbstractRule
+{
+
+    /** @var RewardValidation */
+    private $rewardValidation;
+
+    /**
+     * CanCreateReward constructor.
+     * @param RewardValidation $rewardValidation
+     */
+    public function __construct(RewardValidation $rewardValidation)
+    {
+        $this->rewardValidation = $rewardValidation;
+    }
+
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        if (!Auth::user()->can('add reward')) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * @param RewardObject $object
+     * @return bool
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    protected function validators($object): bool
+    {
+        return true; // $this->rewardValidation->validate($object, 'POST');
+    }
+
+    /**
+     * @param RewardObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+}
diff --git a/app/Classes/Modules/Rewards/Standards/Rules/CanDeleteReward.php b/app/Classes/Modules/Rewards/Standards/Rules/CanDeleteReward.php
new file mode 100644
index 00000000..888b0d1e
--- /dev/null
+++ b/app/Classes/Modules/Rewards/Standards/Rules/CanDeleteReward.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Classes\Modules\Rewards\Standards\Rules;
+
+use App\Classes\General\Abstracts\AbstractRule;
+use App\Classes\Modules\Rewards\DataTransferObjects\RewardObject;
+use Illuminate\Support\Facades\Auth;
+
+class CanDeleteReward extends AbstractRule
+{
+    /**
+     * @return bool
+     */
+    protected function authorized(): bool
+    {
+        if (!Auth::user()->can('delete reward')) {
+            return false;
+        }
+
+        return true;
+
+    }
+
+    /**
+     * @param RewardObject $object
+     * @return bool
+     */
+    protected function validators($object): bool
+    {
+        return true;
+
+    }
+
+
+    /**
+     * @param RewardObject $object
+     * @return bool
+     */
+    protected function criteria($object): bool
+    {
+        return true;
+    }
+
+}
diff --git a/app/Classes/Modules/Rewards/Standards/Validators/RewardValidation.php b/app/Classes/Modules/Rewards/Standards/Validators/RewardValidation.php
new file mode 100644
index 00000000..18d875dc
--- /dev/null
+++ b/app/Classes/Modules/Rewards/Standards/Validators/RewardValidation.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace App\Classes\Modules\Rewards\Standards\Validators;
+
+
+use App\Classes\General\Abstracts\AbstractValidation;
+use App\Classes\Modules\Rewards\DataTransferObjects\RewardObject;
+use App\Models\Reward;
+
+class RewardValidation extends AbstractValidation
+{
+    /**
+     * @param RewardObject $object
+     * @return array
+     */
+    protected function data($object): array {
+
+        $data = [
+            'name'=> $object->getName(),
+            'description' => $object->getDescription(),
+        ];
+
+        return $data;
+    }
+
+    /**
+     * @param null|string $type
+     * @return array
+     */
+    protected function rules(): array {
+        return [
+            'name' => [
+                'required',
+                function ($attribute, $value, $fail) {
+                    // Check if reward name already exists in the database
+                    $existingMilestone = Reward::where('name', $value)->first();
+                    if ($existingMilestone) {
+                        $fail("The {$attribute} reward name already exists in the database.");
+                    }
+                },
+            ],
+            'description' => [
+                'required',
+            ]
+        ];
+    }
+
+    /**
+     * @return array
+     */
+    protected function messages(): array {
+        return [];
+    }
+
+}
diff --git a/app/Classes/Modules/Transactions/Services/UpdatesTransactionStatus.php b/app/Classes/Modules/Transactions/Services/UpdatesTransactionStatus.php
index 9d6b9fe4..d92e3e9a 100644
--- a/app/Classes/Modules/Transactions/Services/UpdatesTransactionStatus.php
+++ b/app/Classes/Modules/Transactions/Services/UpdatesTransactionStatus.php
@@ -5,19 +5,27 @@ namespace App\Classes\Modules\Transactions\Services;
 use App\Classes\General\Eloquent\AbstractUpdateRecord;
 use App\Classes\Modules\PerfexCRM\Processors\TransactionToPerfexCRMProcessorV2;
 use App\Models\Transaction;
-use App\Classes\Modules\PerfexCRM\Processors\TransactionToPerfexCRMProcessor;
+use App\Classes\Modules\Vouchers\Processors\Voucherify\TransactionToVoucherifyProcessor;
+use App\Classes\ValueObjects\Constants\ApprovalStatus;
+use App\Classes\ValueObjects\Constants\TransactionType;
 
 class UpdatesTransactionStatus extends AbstractUpdateRecord
 {
     /** @var TransactionToPerfexCRMProcessorV2 */
     private $transactionToPerfexCRMProcessor;
 
+    /** @var TransactionToVoucherifyProcessor */
+    private $transactionToVoucherifyProcessor;
+
     /**
+     * UpdatesTransactionStatus constructor.
      * @param TransactionToPerfexCRMProcessorV2 $transactionToPerfexCRMProcessor
+     * @param TransactionToVoucherifyProcessor $transactionToVoucherifyProcessor
      */
-    public function __construct(TransactionToPerfexCRMProcessorV2 $transactionToPerfexCRMProcessor)
+    public function __construct(TransactionToPerfexCRMProcessorV2 $transactionToPerfexCRMProcessor, TransactionToVoucherifyProcessor $transactionToVoucherifyProcessor)
     {
         $this->transactionToPerfexCRMProcessor = $transactionToPerfexCRMProcessor;
+        $this->transactionToVoucherifyProcessor = $transactionToVoucherifyProcessor;
     }
 
 
@@ -35,6 +43,11 @@ class UpdatesTransactionStatus extends AbstractUpdateRecord
         if(config('perfexcrm.is_enabled') == 'true'){
             $this->transactionToPerfexCRMProcessor->execute($transaction, $status);
         }
+
+        if($status == ApprovalStatus::APPROVED && ($transaction->type == TransactionType::PAYMENT || $transaction->type == TransactionType::TOP_UP)){
+            $this->transactionToVoucherifyProcessor->execute($transaction, "PAID");
+        }
+
         return $result;
     }
 }
diff --git a/app/Classes/Modules/Vouchers/ControllersLogic/CreateVoucherLogic.php b/app/Classes/Modules/Vouchers/ControllersLogic/CreateVoucherLogic.php
new file mode 100644
index 00000000..a5d65544
--- /dev/null
+++ b/app/Classes/Modules/Vouchers/ControllersLogic/CreateVoucherLogic.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace App\Classes\Modules\Vouchers\ControllersLogic;
+
+
+use App\Classes\Exceptions\MalformedRequestException;
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Vouchers\Processors\CreateVoucherProcessor;
+use App\Models\User;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+
+class CreateVoucherLogic extends AbstractControllerLogic
+{
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Create Voucher',
+            'message' => 'You have successfully created a voucher'
+        ];
+    }
+
+    /** @var CreateVoucherProcessor */
+    private $createVoucherProcessor;
+
+    /**
+     * CreateVoucherLogic constructor.
+     * @param CreateVoucherProcessor $createVoucherProcessor
+     */
+    public function __construct(CreateVoucherProcessor $createVoucherProcessor)
+    {
+        $this->createVoucherProcessor = $createVoucherProcessor;
+    }
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws MalformedRequestException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $user = User::where('id', $request->input('userId'))->first();
+        $result = $this->createVoucherProcessor->execute($user, $request->input('voucherCode'), null);
+        return $this->response(['data' => $result]);
+    }
+}
diff --git a/app/Classes/Modules/Vouchers/ControllersLogic/ListUserVouchersLogic.php b/app/Classes/Modules/Vouchers/ControllersLogic/ListUserVouchersLogic.php
new file mode 100644
index 00000000..16356f0f
--- /dev/null
+++ b/app/Classes/Modules/Vouchers/ControllersLogic/ListUserVouchersLogic.php
@@ -0,0 +1,46 @@
+<?php
+
+namespace App\Classes\Modules\Vouchers\ControllersLogic;
+
+use App\Classes\General\Abstracts\AbstractControllerLogic;
+use App\Classes\Modules\Rewards\Services\ListsUserRewards;
+use App\Http\Resources\UserRewardResource;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ListUserVouchersLogic extends AbstractControllerLogic
+{
+    /**
+     * ListUserVouchersLogic constructor.
+     * @param ListsUserRewards $listsUserRewards
+     */
+    public function __construct(ListsUserRewards $listsUserRewards)
+    {
+        $this->listsUserRewards = $listsUserRewards;
+    }
+
+    /**
+     * @return array
+     */
+    protected function notification():array {
+        return [
+            'title' => 'Retrieved User Vouchers',
+            'message' => 'You have successfully retrieved a list of user vouchers'
+        ];
+    }
+
+    /** @var ListsUserRewards */
+    private $listsUserRewards;
+
+    /**
+     * @param Request $request
+     * @return JsonResponse
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function logic(Request $request) : JsonResponse
+    {
+        $query = $this->listsUserRewards->execute($this->listsUserRewards->deserializeFilters($request->input('filters')));
+        return $this->collectionResponse(UserRewardResource::collection($query));
+    }
+
+}
diff --git a/app/Classes/Modules/Vouchers/ControllersLogic/RedeemVoucherLogic.php b/app/Classes/Modules/Vouchers/ControllersLogic/RedeemVoucherLogic.php
deleted file mode 100644
index 58980b64..00000000
--- a/app/Classes/Modules/Vouchers/ControllersLogic/RedeemVoucherLogic.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Vouchers\ControllersLogic;
-
-
-use App\Classes\Exceptions\MalformedRequestException;
-use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Vouchers\Services\RedeemsVoucher;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use ErrorException;
-
-class RedeemVoucherLogic extends AbstractControllerLogic
-{
-    /**
-     * @return array
-     */
-    protected function notification():array {
-        return [
-            'title' => 'Redeem Voucher',
-            'message' => 'You have successfully redeemed a voucher'
-        ];
-    }
-
-    /** @var RedeemsVoucher */
-    private $redeemsVoucher;
-
-    /**
-     * RedeemVoucherLogic constructor.
-     */
-    public function __construct(RedeemsVoucher $redeemVoucher)
-    {
-        $this->redeemsVoucher = $redeemVoucher;
-    }
-
-    /**
-     * @param Request $request
-     * @return JsonResponse
-     * @throws MalformedRequestException
-     */
-    public function logic(Request $request) : JsonResponse
-    {
-        $result =  $this->redeemsVoucher->execute($request->input('promoCode'), $request->input('amount'));
-        return $this->response(['data' => $result]);
-    }
-
-
-}
diff --git a/app/Classes/Modules/Vouchers/ControllersLogic/ValidateVoucherLogic.php b/app/Classes/Modules/Vouchers/ControllersLogic/ValidateVoucherLogic.php
index b3e1ff7d..4b820eb1 100644
--- a/app/Classes/Modules/Vouchers/ControllersLogic/ValidateVoucherLogic.php
+++ b/app/Classes/Modules/Vouchers/ControllersLogic/ValidateVoucherLogic.php
@@ -5,10 +5,11 @@ namespace App\Classes\Modules\Vouchers\ControllersLogic;
 
 use App\Classes\Exceptions\MalformedRequestException;
 use App\Classes\General\Abstracts\AbstractControllerLogic;
-use App\Classes\Modules\Vouchers\Services\ValidatesVoucher;
+use App\Classes\Modules\Vouchers\Services\Voucherify\ValidatesVoucherifyVoucher;
+use App\Classes\Modules\Vouchers\DataTransferObjects\ValidateVoucherifyVoucherObject;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
-use ErrorException;
+use App\Models\Booking;
 
 class ValidateVoucherLogic extends AbstractControllerLogic
 {
@@ -22,15 +23,16 @@ class ValidateVoucherLogic extends AbstractControllerLogic
         ];
     }
 
-    /** @var ValidatesVoucher */
-    private $validatesVoucher;
+    /** @var ValidatesVoucherifyVoucher */
+    private $validatesVoucherifyVoucher;
 
     /**
      * ValidateVoucherLogic constructor.
+     * @param ValidatesVoucherifyVoucher $validatesVoucherifyVoucher
      */
-    public function __construct(ValidatesVoucher $validatesVoucher)
+    public function __construct(ValidatesVoucherifyVoucher $validatesVoucherifyVoucher)
     {
-        $this->validatesVoucher = $validatesVoucher;
+        $this->validatesVoucherifyVoucher = $validatesVoucherifyVoucher;
     }
 
     /**
@@ -40,9 +42,12 @@ class ValidateVoucherLogic extends AbstractControllerLogic
      */
     public function logic(Request $request) : JsonResponse
     {
-        $result = $this->validatesVoucher->execute($request->input('voucherCode'), null, null);
+        $booking = Booking::find($request->input('itemId'));
+        $employee = $booking->company->employees()->first();
+
+        $validateVoucherifyVoucherObject = new ValidateVoucherifyVoucherObject($booking->company_id, $request->input('voucherCode'), $request->input('amount'), $employee);
+        $result = $this->validatesVoucherifyVoucher->execute($validateVoucherifyVoucherObject);
         return $this->response(['data' => $result]);
     }
 
-
 }
diff --git a/app/Classes/Modules/Vouchers/DataTransferObjects/CreateVoucherifyCustomerObject.php b/app/Classes/Modules/Vouchers/DataTransferObjects/CreateVoucherifyCustomerObject.php
new file mode 100644
index 00000000..b92f0e05
--- /dev/null
+++ b/app/Classes/Modules/Vouchers/DataTransferObjects/CreateVoucherifyCustomerObject.php
@@ -0,0 +1,71 @@
+<?php
+
+namespace App\Classes\Modules\Vouchers\DataTransferObjects;
+
+use App\Classes\General\Interfaces\DataTransferObject;
+use App\Models\User;
+
+class CreateVoucherifyCustomerObject implements DataTransferObject
+{
+    /** @var int */
+    private $companyId;
+
+    /** @var User */
+    private $user;
+
+    /** @var bool */
+    private $isNew; //this is to cater for creating customer that is existing in system but not yet exist in voucherify
+
+    /** @var string */
+    private $acquisitionChannel;
+
+    /**
+     * CreateVoucherifyCustomerObject constructor.
+     * @param int $companyId
+     * @param User $user
+     * @param bool $isNew
+     * @param string $acquisitionChannel
+     */
+    public function __construct(int $companyId, User $user, bool $isNew, string $acquisitionChannel = 'exchange')
+    {
+        $this->companyId = $companyId;
+        $this->user = $user;
+        $this->isNew = $isNew;
+        $this->acquisitionChannel = $acquisitionChannel;
+    }
+
+    /**
+     * @return int
+     */
+    public function getCompanyId(): int
+    {
+        return $this->companyId;
+    }
+
+
+    /**
+     * @return User
+     */
+    public function getUser(): User
+    {
+        return $this->user;
+    }
+
+
+    /**
+     * @return bool
+     */
+    public function getIsNew(): bool
+    {
+        return $this->isNew;
+    }
+
+    /**
+     * @return string
+     */
+    public function getAcquisitionChannel(): string
+    {
+        return $this->acquisitionChannel;
+    }
+
+}
diff --git a/app/Classes/Modules/Vouchers/DataTransferObjects/CreateVoucherifyOrderObject.php b/app/Classes/Modules/Vouchers/DataTransferObjects/CreateVoucherifyOrderObject.php
new file mode 100644
index 00000000..e1fa189a
--- /dev/null
+++ b/app/Classes/Modules/Vouchers/DataTransferObjects/CreateVoucherifyOrderObject.php
@@ -0,0 +1,82 @@
+<?php
+
+namespace App\Classes\Modules\Vouchers\DataTransferObjects;
+
+
+use App\Classes\General\Interfaces\DataTransferObject;
+use App\Models\User;
+
+class CreateVoucherifyOrderObject implements DataTransferObject
+{
+    /** @var User  */
+    private $employee;
+
+    /** @var int */
+    private $companyId;
+
+    /** @var float */
+    private $amount;
+
+    /** @var bool */
+    private $isNoVoucher;
+
+    /** @var bool */
+    private $isTopUpWallet;
+
+    /**
+     * CreateVoucherifyOrderObject constructor.
+     * @param User $employee
+     * @param int $companyId
+     * @param float $amount
+     * @param bool $isNoVoucher
+     * @param bool $isTopUpWallet
+     */
+    public function __construct(User $employee, int $companyId, float $amount, bool $isNoVoucher, bool $isTopUpWallet)
+    {
+        $this->employee = $employee;
+        $this->companyId = $companyId;
+        $this->amount = $amount;
+        $this->isNoVoucher = $isNoVoucher;
+        $this->isTopUpWallet = $isTopUpWallet;
+    }
+
+    /**
+     * @return int
+     */
+    public function getCompanyId(): string
+    {
+        return $this->companyId;
+    }
+
+    /**
+     * @return float
+     */
+    public function getAmount(): float
+    {
+        return $this->amount;
+    }
+
+    /**
+     * @return User
+     */
+    public function getEmployee(): User
+    {
+        return $this->employee;
+    }
+
+    /**
+     * @return bool
+     */
+    public function getIsNoVoucher(): bool
+    {
+        return $this->isNoVoucher;
+    }
+
+    /**
+     * @return bool
+     */
+    public function getIsTopUpWallet(): bool
+    {
+        return $this->isTopUpWallet;
+    }
+}
diff --git a/app/Classes/Modules/Vouchers/DataTransferObjects/RedeemVoucherifyVoucherObject.php b/app/Classes/Modules/Vouchers/DataTransferObjects/RedeemVoucherifyVoucherObject.php
new file mode 100644
index 00000000..01f5431c
--- /dev/null
+++ b/app/Classes/Modules/Vouchers/DataTransferObjects/RedeemVoucherifyVoucherObject.php
@@ -0,0 +1,69 @@
+<?php
+
+namespace App\Classes\Modules\Vouchers\DataTransferObjects;
+
+use App\Classes\General\Interfaces\DataTransferObject;
+
+class RedeemVoucherifyVoucherObject implements DataTransferObject
+{
+    /** @var int */
+    private $companyId;
+
+    /** @var string */
+    private $promoCode;
+
+    /** @var string */
+    private $amount;
+
+    /** @var object */
+    private $employee;
+
+    /**
+     * RedeemVoucherifyVoucherObject constructor.
+     * @param int $companyId
+     * @param string $name
+     * @param string $email
+     * @param object $employee
+     */
+    public function __construct(int $companyId, string $promoCode, string $amount, object $employee)
+    {
+        $this->companyId = $companyId;
+        $this->promoCode = $promoCode;
+        $this->amount = $amount;
+        $this->employee = $employee;
+    }
+
+    /**
+     * @return int
+     */
+    public function getCompanyId(): int
+    {
+        return $this->companyId;
+    }
+
+
+    /**
+     * @return string
+     */
+    public function getPromoCode(): string
+    {
+        return $this->promoCode;
+    }
+
+    /**
+     * @return string
+     */
+    public function getAmount(): string
+    {
+        return $this->amount;
+    }
+
+    /**
+     * @return object
+     */
+    public function getEmployee(): object
+    {
+        return $this->employee;
+    }
+
+}
diff --git a/app/Classes/Modules/Vouchers/DataTransferObjects/UpdateVoucherifyOrderObject.php b/app/Classes/Modules/Vouchers/DataTransferObjects/UpdateVoucherifyOrderObject.php
new file mode 100644
index 00000000..bc49ee86
--- /dev/null
+++ b/app/Classes/Modules/Vouchers/DataTransferObjects/UpdateVoucherifyOrderObject.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Classes\Modules\Vouchers\DataTransferObjects;
+
+
+use App\Classes\General\Interfaces\DataTransferObject;
+
+class UpdateVoucherifyOrderObject implements DataTransferObject
+{
+    /** @var string  */
+    private $id;
+
+    /** @var string  */
+    private $status;
+
+    /**
+     * UpdateVoucherifyOrderObject constructor.
+     * @param string $id
+     * @param string $status
+     */
+    public function __construct(string $id, string $status)
+    {
+        $this->id = $id;
+        $this->status = $status;
+    }
+
+    /**
+     * @return string
+     */
+    public function getId(): string
+    {
+        return $this->id;
+    }
+
+    /**
+     * @return string
+     */
+    public function getStatus(): string
+    {
+        return $this->status;
+    }
+}
diff --git a/app/Classes/Modules/Vouchers/DataTransferObjects/ValidateVoucherifyVoucherObject.php b/app/Classes/Modules/Vouchers/DataTransferObjects/ValidateVoucherifyVoucherObject.php
new file mode 100644
index 00000000..b48bee16
--- /dev/null
+++ b/app/Classes/Modules/Vouchers/DataTransferObjects/ValidateVoucherifyVoucherObject.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace App\Classes\Modules\Vouchers\DataTransferObjects;
+
+
+use App\Classes\General\Interfaces\DataTransferObject;
+use App\Models\User;
+
+class ValidateVoucherifyVoucherObject implements DataTransferObject
+{
+    /** @var int */
+    private $companyId;
+
+    /** @var string */
+    private $voucherCode;
+
+    /** @var float */
+    private $amount;
+
+    /** @var User  */
+    private $user;
+
+    /**
+     * ValidateVoucherifyVoucherObject constructor.
+     * @param int $companyId
+     * @param string $voucherCode
+     * @param float $amount
+     * @param User $user
+     */
+    public function __construct(int $companyId, string $voucherCode, float $amount, User $user)
+    {
+        $this->companyId = $companyId;
+        $this->voucherCode = $voucherCode;
+        $this->amount = $amount;
+        $this->user = $user;
+    }
+
+    /**
+     * @return int
+     */
+    public function getCompanyId(): int
+    {
+        return $this->companyId;
+    }
+
+    /**
+     * @return string
+     */
+    public function getVoucherCode(): string
+    {
+        return $this->voucherCode;
+    }
+
+    /**
+     * @return float
+     */
+    public function getAmount(): float
+    {
+        return $this->amount;
+    }
+
+    /**
+     * @return User
+     */
+    public function getUser(): User
+    {
+        return $this->user;
+    }
+
+}
diff --git a/app/Classes/Modules/Vouchers/DataTransferObjects/VoucherEntityObject.php b/app/Classes/Modules/Vouchers/DataTransferObjects/VoucherEntityObject.php
new file mode 100644
index 00000000..692b221b
--- /dev/null
+++ b/app/Classes/Modules/Vouchers/DataTransferObjects/VoucherEntityObject.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Classes\Modules\Vouchers\DataTransferObjects;
+
+use App\Classes\General\Interfaces\DataTransferObject;
+
+class VoucherEntityObject implements DataTransferObject
+{
+    /** @var string */
+    private $id;
+
+    /** @var string */
+    private $type;
+
+    /**
+     * VoucherEntityObject constructor.
+     * @param string $id
+     * @param string $type
+     */
+    public function __construct(string $id, string $type)
+    {
+        $this->id = $id;
+        $this->type = $type;
+    }
+
+    /**
+     * @return string
+     */
+    public function getId(): string
+    {
+        return $this->id;
+    }
+
+    /**
+     * @return string
+     */
+    public function getType(): string
+    {
+        return $this->type;
+    }
+}
diff --git a/app/Classes/Modules/Vouchers/DataTransferObjects/VoucherObject.php b/app/Classes/Modules/Vouchers/DataTransferObjects/VoucherObject.php
index 24b01612..f624b3cc 100644
--- a/app/Classes/Modules/Vouchers/DataTransferObjects/VoucherObject.php
+++ b/app/Classes/Modules/Vouchers/DataTransferObjects/VoucherObject.php
@@ -3,6 +3,8 @@
 namespace App\Classes\Modules\Vouchers\DataTransferObjects;
 
 use App\Classes\General\Interfaces\DataTransferObject;
+use DateTime;
+use Illuminate\Support\Facades\Log;
 
 class VoucherObject implements DataTransferObject
 {
@@ -18,19 +20,29 @@ class VoucherObject implements DataTransferObject
     /** @var float|null */
     private $value;
 
+    /** @var string|null */
+    private $startDate;
+
+    /** @var string|null */
+    private $endDate;
+
     /**
      * VoucherObject constructor.
      * @param string $code
      * @param string $name
      * @param string $type
      * @param float $value
+     * @param string $startDate
+     * @param string $endDate
      */
-    public function __construct(string $code, ?string $name, ?string $type, ?float $value)
+    public function __construct(string $code, ?string $name, ?string $type, ?float $value, ?string $startDate = '', ?string $endDate = '')
     {
         $this->code = $code;
         $this->name = $name;
         $this->type = $type;
         $this->value = $value;
+        $this->startDate = $startDate;
+        $this->endDate = $endDate;
     }
 
     /**
@@ -67,4 +79,33 @@ class VoucherObject implements DataTransferObject
         return $this->value;
     }
 
+    /**
+     * @return DateTime
+     */
+    public function getStartDate(): ?DateTime
+    {
+        try {
+            if(!$this->startDate) return null;
+            $dateTime = new DateTime($this->startDate);
+            return $dateTime;
+        } catch (\Exception $e) {
+            Log::error($e);
+            return null;
+        }
+    }
+
+    /**
+     * @return DateTime
+     */
+    public function getEndDate(): ?DateTime
+    {
+        try {
+            if(!$this->endDate) return null;
+            $dateTime = new DateTime($this->endDate);
+            return $dateTime;
+        } catch (\Exception $e) {
+            Log::error($e);
+            return null;
+        }
+    }
 }
diff --git a/app/Classes/Modules/Vouchers/Processors/CreateVoucherProcessor.php b/app/Classes/Modules/Vouchers/Processors/CreateVoucherProcessor.php
new file mode 100644
index 00000000..690ad59f
--- /dev/null
+++ b/app/Classes/Modules/Vouchers/Processors/CreateVoucherProcessor.php
@@ -0,0 +1,114 @@
+<?php
+
+namespace App\Classes\Modules\Vouchers\Processors;
+
+
+use App\Classes\Modules\Vouchers\Services\Voucherify\FetchesVoucherifyVoucher;
+use App\Classes\Modules\Vouchers\Services\Voucherify\ValidatesVoucherifyVoucher;
+use App\Classes\Modules\Vouchers\Services\CreatesVoucher;
+use App\Classes\Modules\Vouchers\Services\FetchesVoucher;
+use App\Classes\Modules\Rewards\Services\CreatesUserReward;
+use App\Classes\Modules\Vouchers\DataTransferObjects\VoucherObject;
+use App\Classes\Modules\Vouchers\DataTransferObjects\ValidateVoucherifyVoucherObject;
+use App\Classes\ValueObjects\Constants\RoleTypes;
+use App\Models\User;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Log;
+
+
+class CreateVoucherProcessor
+{
+    /** @var FetchesVoucherifyVoucher */
+    private $fetchesVoucherifyVoucher;
+
+    /** @var ValidatesVoucherifyVoucher */
+    private $validatesVoucherifyVoucher;
+
+    /** @var CreatesVoucher */
+    private $createsVoucher;
+
+    /** @var CreatesUserReward */
+    private $createsUserReward;
+
+    /** @var FetchesVoucher */
+    private $fetchesVoucher;
+
+    /**
+     * CreateVoucherProcessor constructor.
+     * @param FetchesVoucherifyVoucher $fetchesVoucherifyVoucher
+     * @param ValidatesVoucherifyVoucher $validatesVoucherifyVoucher
+     * @param CreatesVoucher $createsVoucher
+     * @param CreatesUserReward $createsUserReward
+     * @param FetchesVoucher $fetchesVoucher
+     */
+    public function __construct(FetchesVoucherifyVoucher $fetchesVoucherifyVoucher, CreatesVoucher $createsVoucher, CreatesUserReward $createsUserReward, FetchesVoucher $fetchesVoucher, ValidatesVoucherifyVoucher $validatesVoucherifyVoucher)
+    {
+        $this->fetchesVoucherifyVoucher = $fetchesVoucherifyVoucher;
+        $this->createsVoucher = $createsVoucher;
+        $this->createsUserReward = $createsUserReward;
+        $this->fetchesVoucher = $fetchesVoucher;
+        $this->validatesVoucherifyVoucher = $validatesVoucherifyVoucher;
+    }
+
+
+    /**
+     * @param ?User $userParam
+     * @param string $voucherCodeInput
+     * @return array
+     * @throws \App\Classes\Exceptions\AccessForbiddenException
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \App\Classes\Exceptions\RequestValidationException
+     */
+    public function execute(?User $userParam, string $voucherCodeInput) {
+        try{
+            $result = null;
+            $user = Auth::user(); /** @var User $user */
+            if($user && isset($user->type) && in_array($user->type, RoleTypes::ADMIN_ROLES) && $userParam){
+                $user = User::where('id', $userParam->id)->first();
+            }
+            else{
+                $user = $userParam ? $userParam : $user;
+            }
+
+            //Voucherify - Validates Voucher
+            $ValidateVoucherifyVoucherObject = new ValidateVoucherifyVoucherObject(0, $voucherCodeInput, 0.00, $user);
+            $voucherifyVoucherValidated = $this->validatesVoucherifyVoucher->execute($ValidateVoucherifyVoucherObject);
+
+            if(isset($voucherifyVoucherValidated->reason)){
+                $result = [];
+                $result['reason'] = $voucherifyVoucherValidated->reason;
+            }
+            else if($voucherifyVoucherValidated){
+                $voucher = $this->recordVoucherInfo($user, $voucherCodeInput);
+                $voucherCount = $user->rewards->where('voucher_id', $voucher->id)->count();
+                if($voucherCount == 0){
+                    $result = $this->createsUserReward->execute(null, $user, $voucher->id);
+                }
+                else{
+                    $result['reason'] = 'Voucher already added';
+                }
+            }
+
+            return $result;
+        } catch (\Exception $e) {
+            Log::error($e);
+        }
+    }
+
+    private function recordVoucherInfo(User $user, string $voucherCodeInput){
+           //Voucherify - Get Voucher
+           $voucherifyVoucherFetched = $this->fetchesVoucherifyVoucher->execute($user, $voucherCodeInput);
+
+           $voucherName = $voucherifyVoucherFetched->campaign;
+           $voucherType = $voucherifyVoucherFetched->discount->type;
+           $voucherValue = isset($voucherifyVoucherFetched->discount->amount_off) ? $voucherifyVoucherFetched->discount->amount_off : $voucherifyVoucherFetched->discount->percent_off;
+           $voucherCode = $voucherifyVoucherFetched->code;
+           $voucherStartDate = $voucherifyVoucherFetched->start_date;
+           $voucherEndDate = $voucherifyVoucherFetched->expiration_date;
+
+           $voucherObject= new VoucherObject($voucherCode, isset($voucherName) ? $voucherName : "Voucherify Voucher Added Manually", $voucherType, $voucherValue, $voucherStartDate, $voucherEndDate);
+           $voucher = $this->createsVoucher->execute($voucherObject);
+           if(!$voucher) $voucher = $this->fetchesVoucher->execute(['code' => $voucherCodeInput]);
+        return $voucher;
+    }
+}
diff --git a/app/Classes/Modules/Vouchers/Processors/Voucherify/BookingToVoucherifyProcessor.php b/app/Classes/Modules/Vouchers/Processors/Voucherify/BookingToVoucherifyProcessor.php
new file mode 100644
index 00000000..3df08a4c
--- /dev/null
+++ b/app/Classes/Modules/Vouchers/Processors/Voucherify/BookingToVoucherifyProcessor.php
@@ -0,0 +1,163 @@
+<?php
+
+namespace App\Classes\Modules\Vouchers\Processors\Voucherify;
+
+use App\Classes\Modules\Vouchers\Services\CreatesVoucher;
+use App\Classes\Modules\Vouchers\Services\FetchesVoucher;
+use App\Classes\Modules\Vouchers\DataTransferObjects\VoucherObject;
+use App\Classes\Modules\Vouchers\Services\Voucherify\RedeemsVoucherifyVoucher;
+use App\Classes\Modules\Vouchers\Services\CreatesVoucherRedemption;
+use App\Classes\Modules\Vouchers\DataTransferObjects\RedeemVoucherifyVoucherObject;
+use App\Classes\Modules\Vouchers\DataTransferObjects\CreateVoucherifyOrderObject;
+use App\Classes\Modules\Vouchers\Services\Voucherify\CreatesVoucherifyOrder;
+use App\Classes\Modules\Vouchers\Services\CreatesVoucherEntityMapping;
+use App\Classes\Modules\Vouchers\DataTransferObjects\VoucherEntityObject;
+use App\Classes\Modules\Rewards\Services\CreatesUserReward;
+use App\Classes\ValueObjects\Constants\TransactionType;
+use App\Classes\ValueObjects\Constants\VoucherifyEntityType;
+use App\Models\User;
+use App\Models\Transaction;
+use App\Models\Voucher;
+use Illuminate\Support\Facades\Log;
+
+class BookingToVoucherifyProcessor
+{
+    /** @var CreatesVoucher */
+    private $createsVoucher;
+
+    /** @var FetchesVoucher */
+    private $fetchesVoucher;
+
+    /** @var CreatesVoucherRedemption */
+    private $createsVoucherRedemption;
+
+    /** @var RedeemsVoucherifyVoucher */
+    private $redeemsVoucherifyVoucher;
+
+    /** @var CreatesVoucherifyOrder */
+    private $createsVoucherifyOrder;
+
+    /** @var CreatesVoucherEntityMapping */
+    private $createsVoucherEntityMapping;
+
+    /** @var CreatesUserReward */
+    private $createsUserReward;
+
+    /**
+     * BookingToVoucherifyProcessor constructor.
+     * @param CreatesVoucher $createsVoucher
+     * @param FetchesVoucher $fetchesVoucher
+     * @param CreatesVoucherRedemption $createsVoucherRedemption
+     * @param RedeemsVoucherifyVoucher $redeemsVoucherifyVoucher
+     * @param CreatesVoucherifyOrder $createsVoucherifyOrder
+     * @param CreatesVoucherEntityMapping $createsVoucherEntityMapping
+     * @param CreatesUserReward $createsUserReward
+    */
+    public function __construct(CreatesVoucher $createsVoucher, FetchesVoucher $fetchesVoucher, CreatesVoucherRedemption $createsVoucherRedemption, RedeemsVoucherifyVoucher $redeemsVoucherifyVoucher, CreatesVoucherifyOrder $createsVoucherifyOrder, CreatesVoucherEntityMapping $createsVoucherEntityMapping, CreatesUserReward $createsUserReward)
+    {
+        $this->createsVoucher = $createsVoucher;
+        $this->fetchesVoucher = $fetchesVoucher;
+        $this->createsVoucherRedemption = $createsVoucherRedemption;
+        $this->redeemsVoucherifyVoucher = $redeemsVoucherifyVoucher;
+        $this->createsVoucherifyOrder = $createsVoucherifyOrder;
+        $this->createsVoucherEntityMapping = $createsVoucherEntityMapping;
+        $this->createsUserReward = $createsUserReward;
+    }
+
+
+    /**
+     * @param User $user
+     * @param Transaction $transaction
+     * @param int $companyId
+     * @param float $amount
+     * @param float $voucherDiscountAmount
+     * @param string $voucherCode
+     * @return void
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \Voucherify\ClientException
+     */
+    public function execute(User $user, Transaction $transaction, int $companyId, float $amount, float $voucherDiscountAmount, ?string $voucherCode = "")
+    {
+        try{
+            $voucherify_customer_id = "";
+            $voucherify_order_id = "";
+            if($voucherCode){
+                $redeemVoucherifyVoucherObject = new RedeemVoucherifyVoucherObject($companyId, $voucherCode, $amount, $user);
+                $redeemVoucherResult = $this->redeemsVoucherifyVoucher->execute($redeemVoucherifyVoucherObject);
+                $redeemedVoucher = $redeemVoucherResult->voucher;
+                $redemptionId = $redeemVoucherResult->id;
+
+                if($redeemVoucherResult && isset($redeemVoucherResult->order)){
+                    $voucherify_order_id = $redeemVoucherResult->order->id;
+                }
+
+                if($redeemVoucherResult && isset($redeemVoucherResult->customer)){
+                    $voucherify_customer_id = $redeemVoucherResult->customer->id;
+                }
+
+                $voucher = $this->recordVoucherInfo($redeemedVoucher, $transaction);
+                $this->createsVoucherRedemption->execute($transaction, $voucher, $redemptionId, $voucherDiscountAmount);
+                $this->recordVoucherForUserInfo($user, $voucher);
+            }
+            else{
+                $createVoucherifyOrderObject = new CreateVoucherifyOrderObject($user, $companyId, $amount, true, $transaction->type == TransactionType::TOP_UP);
+                $createVoucherufyOrderResult = $this->createsVoucherifyOrder->execute($createVoucherifyOrderObject);
+
+                if($createVoucherufyOrderResult && isset($createVoucherufyOrderResult->id)){
+                    $voucherify_order_id = $createVoucherufyOrderResult->id;
+                    if(isset($createVoucherufyOrderResult->customer)){
+                        $voucherify_customer_id = $createVoucherufyOrderResult->customer->id;
+                    }
+                }
+            }
+
+            $this->recordVoucherifyOrderInfo($voucherify_order_id, $transaction);
+            $this->recordVoucherifyCustomerInfo($voucherify_customer_id, $user);
+
+        } catch (\Exception $e) {
+            Log::error($e);
+        }
+    }
+
+    private function recordVoucherInfo(object $redeemedVoucher){
+        //Create records at 3 tables
+        $voucherValue = isset($redeemedVoucher->discount->amount_off) ? $redeemedVoucher->discount->amount_off : $redeemedVoucher->discount->percent_off;
+        $voucherType = $redeemedVoucher->discount ? $redeemedVoucher->discount->type : null;
+
+        $voucherObject= new VoucherObject($redeemedVoucher->code, isset($redeemedVoucher->metadata->name) ? $redeemedVoucher->metadata->name : "", $voucherType, $voucherValue);
+        $voucher = $this->createsVoucher->execute($voucherObject);
+        if(!$voucher) $voucher = $this->fetchesVoucher->execute(['code' => $voucherObject->getCode()]);
+
+        return $voucher;
+    }
+
+    private function recordVoucherForUserInfo(User $user, Voucher $voucher){
+        //create reward to user (user_reward)
+        $voucherCount = $user->rewards->where('voucher_id', $voucher->id)->count();
+        if($voucherCount == 0){
+            $this->createsUserReward->execute(null, $user, $voucher->id);
+        }
+    }
+
+    private function recordVoucherifyOrderInfo(string $voucherify_order_id, Transaction $transaction){
+        //Update Database - 1 table
+        if($voucherify_order_id){
+            $voucherify_entity = $transaction->voucherifyEntities()->first();
+            if(!$voucherify_entity){
+                $voucherEntityObject = new VoucherEntityObject($voucherify_order_id, VoucherifyEntityType::ORDER);
+                $this->createsVoucherEntityMapping->execute($transaction, $voucherEntityObject);
+            }
+        }
+    }
+
+    private function recordVoucherifyCustomerInfo(string $voucherify_customer_id, User $user){
+        //Update Database - 1 table
+        if($voucherify_customer_id){
+            $voucherify_entity = $user->voucherifyEntities()->first();
+            if(!$voucherify_entity){
+                $voucherEntityObject = new VoucherEntityObject($voucherify_customer_id, VoucherifyEntityType::CUSTOMER);
+                $this->createsVoucherEntityMapping->execute($user, $voucherEntityObject);
+            }
+        }
+    }
+}
diff --git a/app/Classes/Modules/Vouchers/Processors/Voucherify/NewCustomerToVoucherifyProcessor.php b/app/Classes/Modules/Vouchers/Processors/Voucherify/NewCustomerToVoucherifyProcessor.php
new file mode 100644
index 00000000..006bcd94
--- /dev/null
+++ b/app/Classes/Modules/Vouchers/Processors/Voucherify/NewCustomerToVoucherifyProcessor.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace App\Classes\Modules\Vouchers\Processors\Voucherify;
+
+use App\Classes\Modules\Vouchers\Services\CreatesVoucherEntityMapping;
+use App\Classes\Modules\Vouchers\Services\Voucherify\CreatesVoucherifyCustomer;
+use App\Classes\Modules\Vouchers\DataTransferObjects\CreateVoucherifyCustomerObject;
+use App\Classes\Modules\Vouchers\DataTransferObjects\VoucherEntityObject;
+use App\Classes\ValueObjects\Constants\VoucherifyEntityType;
+use App\Models\User;
+use Illuminate\Support\Facades\Log;
+
+class NewCustomerToVoucherifyProcessor
+{
+    /** @var CreatesVoucherEntityMapping */
+    private $createsVoucherEntityMapping;
+
+    /** @var CreatesVoucherifyCustomer */
+    private $createsVoucherifyCustomer;
+
+    /**
+     * NewCustomerToVoucherifyProcessor constructor.
+     * @param CreatesVoucherEntityMapping $createsVoucherEntityMapping
+     * @param CreatesVoucherifyCustomer $createsVoucherifyCustomer
+    */
+    public function __construct(CreatesVoucherEntityMapping $createsVoucherEntityMapping, CreatesVoucherifyCustomer $createsVoucherifyCustomer)
+    {
+        $this->createsVoucherEntityMapping = $createsVoucherEntityMapping;
+        $this->createsVoucherifyCustomer = $createsVoucherifyCustomer;
+    }
+
+
+    /**
+     * @param int $companyId
+     * @param User $user
+     * @param bool $isNew
+     * @return void
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(int $companyId, User $user, bool $isNew)
+    {
+        try
+        {
+            $createVoucherifyCustomerObject = new CreateVoucherifyCustomerObject($companyId, $user, $isNew);
+            $result = $this->createsVoucherifyCustomer->execute($createVoucherifyCustomerObject);
+
+            if($result && isset($result->id)){
+                $voucherEntityObject = new VoucherEntityObject($result->id, VoucherifyEntityType::CUSTOMER);
+                $this->createsVoucherEntityMapping->execute($createVoucherifyCustomerObject->getUser(), $voucherEntityObject);
+            }
+        } catch (\Exception $e) {
+            Log::error($e);
+        }
+    }
+}
diff --git a/app/Classes/Modules/Vouchers/Processors/Voucherify/TransactionToVoucherifyProcessor.php b/app/Classes/Modules/Vouchers/Processors/Voucherify/TransactionToVoucherifyProcessor.php
new file mode 100644
index 00000000..46dbf7a1
--- /dev/null
+++ b/app/Classes/Modules/Vouchers/Processors/Voucherify/TransactionToVoucherifyProcessor.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Classes\Modules\Vouchers\Processors\Voucherify;
+
+use App\Classes\Modules\Vouchers\DataTransferObjects\UpdateVoucherifyOrderObject;
+use App\Classes\Modules\Vouchers\Services\Voucherify\UpdatesVoucherifyOrder;
+use App\Models\Transaction;
+use Illuminate\Support\Facades\Log;
+
+class TransactionToVoucherifyProcessor
+{
+    /** @var UpdatesVoucherifyOrder */
+    private $updatesVoucherifyOrder;
+
+    /**
+     * TransactionToVoucherifyProcessor constructor.
+     * @param UpdatesVoucherifyOrder $updatesVoucherifyOrder
+    */
+    public function __construct(UpdatesVoucherifyOrder $updatesVoucherifyOrder)
+    {
+        $this->updatesVoucherifyOrder = $updatesVoucherifyOrder;
+    }
+
+
+    /**
+     * @param Transaction $transaction
+     * @param string $status
+     * @return void
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     * @throws \Voucherify\ClientException
+     */
+    public function execute(Transaction $transaction, string $status)
+    {
+        try{
+            $voucherify_entity = $transaction->voucherifyEntities()->first();
+            if($voucherify_entity){
+                $updateVoucherifyOrderObject = new UpdateVoucherifyOrderObject($voucherify_entity->voucherify_entity_id, $status);
+                $this->updatesVoucherifyOrder->execute($updateVoucherifyOrderObject);
+            }
+        } catch (\Exception $e) {
+            Log::error($e);
+        }
+    }
+}
diff --git a/app/Classes/Modules/Vouchers/Services/CreatesVoucher.php b/app/Classes/Modules/Vouchers/Services/CreatesVoucher.php
index 26fb8bfa..9162dda8 100644
--- a/app/Classes/Modules/Vouchers/Services/CreatesVoucher.php
+++ b/app/Classes/Modules/Vouchers/Services/CreatesVoucher.php
@@ -33,6 +33,8 @@ class CreatesVoucher extends AbstractUpdateRecord
             $model->name = $object->getName();
             $model->type = $object->getType();
             $model->value = $object->getValue();
+            $model->start_date = $object->getStartDate();
+            $model->end_date = $object->getEndDate();
             return $this->handler($model);
         }
         return null;
diff --git a/app/Classes/Modules/Vouchers/Services/CreatesVoucherEntityMapping.php b/app/Classes/Modules/Vouchers/Services/CreatesVoucherEntityMapping.php
new file mode 100644
index 00000000..1a1edb28
--- /dev/null
+++ b/app/Classes/Modules/Vouchers/Services/CreatesVoucherEntityMapping.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Classes\Modules\Vouchers\Services;
+
+use App\Classes\General\Eloquent\AbstractUpdateRelationshipRecord;
+use App\Classes\Modules\Vouchers\DataTransferObjects\VoucherEntityObject;
+use App\Classes\General\Interfaces\Voucherifiable;
+use App\Models\VoucherEntityMapping;
+
+class CreatesVoucherEntityMapping extends AbstractUpdateRelationshipRecord
+{
+    /**
+     * @param Voucherifiable $voucherifable
+     * @param VoucherObject $object
+     * @return \Illuminate\Database\Eloquent\Model
+     * @throws \App\Classes\Exceptions\MalformedRequestException
+     */
+    public function execute(Voucherifiable $voucherifable, VoucherEntityObject $object) {
+        $model = new VoucherEntityMapping();
+        $model->voucherify_entity_id = $object->getId();
+        $model->voucherify_entity_type = $object->getType();
+        return $this->handler($voucherifable->voucherifyEntities(), $model);
+    }
+}
diff --git a/app/Classes/Modules/Vouchers/Services/RedeemsVoucher.php b/app/Classes/Modules/Vouchers/Services/RedeemsVoucher.php
deleted file mode 100644
index aaf4d39a..00000000
--- a/app/Classes/Modules/Vouchers/Services/RedeemsVoucher.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Vouchers\Services;
-
-use ErrorException;
-
-class RedeemsVoucher
-{
-
-    /** @var VoucherifyClient */
-    private $voucherifyClient;
-
-
-    /**
-     * RedeemsVoucher constructor.
-     *
-     */
-    public function __construct()
-    {
-        $this->voucherifyClient = createVoucherifyClient();
-    }
-
-     /**
-     * @param string $promoCode
-     * @param string $amount
-     * @param object $employee
-     * @return null|object
-     * @throws ErrorException
-     */
-    public function execute(string $promoCode, string $amount, object $employee)
-    {
-        try {
-            $result = $this->voucherifyClient->redemptions->redeem($promoCode, [
-                "customer" => [
-                    // "id" => $employee->id,
-                    "name" => $employee->name,
-                    "email" => $employee->email,
-                ],
-                "order" => [
-                    "amount" => $amount * 100  //converting it to cents
-                ]
-            ]);
-            return $result;
-        } catch (\Voucherify\ClientException $e) {
-            throw $e;
-        }
-    }
-}
diff --git a/app/Classes/Modules/Vouchers/Services/RollbacksRedemption.php b/app/Classes/Modules/Vouchers/Services/RollbacksRedemption.php
index bd8f6bb2..6bc3bf23 100644
--- a/app/Classes/Modules/Vouchers/Services/RollbacksRedemption.php
+++ b/app/Classes/Modules/Vouchers/Services/RollbacksRedemption.php
@@ -2,7 +2,6 @@
 
 namespace App\Classes\Modules\Vouchers\Services;
 
-use ErrorException;
 use Illuminate\Support\Facades\Log;
 
 class RollbacksRedemption
@@ -24,7 +23,7 @@ class RollbacksRedemption
      /**
      * @param string $redemptionId
      * @return null|object
-     * @throws ErrorException
+     * @throws \Voucherify\ClientException
      */
     public function execute(string $redemptionId)
     {
diff --git a/app/Classes/Modules/Vouchers/Services/ValidatesVoucher.php b/app/Classes/Modules/Vouchers/Services/ValidatesVoucher.php
deleted file mode 100644
index 7705e22e..00000000
--- a/app/Classes/Modules/Vouchers/Services/ValidatesVoucher.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-namespace App\Classes\Modules\Vouchers\Services;
-
-use ErrorException;
-use Illuminate\Support\Facades\Log;
-
-class ValidatesVoucher
-{
-
-    /** @var VoucherifyClient */
-    private $voucherifyClient;
-
-
-    /**
-     * ValidatesVoucher constructor.
-     *
-     */
-    public function __construct()
-    {
-        $this->voucherifyClient = createVoucherifyClient();
-    }
-
-     /**
-     * @param string $voucherCode
-     * @param float $amount
-     * @param object $employee
-     * @return null|object
-     * @throws ErrorException
-     */
-    public function execute(string $voucherCode, ?float $amount, ?object $employee)
-    {
-        try {
-            if($amount){
-                $result = $this->voucherifyClient->validations->validateVoucher($voucherCode, [
-                    "customer" => [
-                        // "id" => $employee->id,
-                        "name" => $employee->name,
-                        "email" => $employee->email,
-                    ],
-                    "order" => [
-                        "amount" => $amount * 100 //converting it to cents
-                        ]
-                    ]);
-            }
-            else{
-                $res = $this->voucherifyClient->validations->validateVoucher($voucherCode);
-                $result = [
-                    "valid" => $res->valid,
-                    "code" => $res->code
-                ];
-                if (isset($res->reason)) {
-                    $result["reason"] = $res->reason;
-                }
-            }
-
-            return $result;
-        } catch (\Voucherify\ClientException $e) {
-            // throw $e;
-            Log::error('ValidatesVoucher error:' . $e);
-            return null;
-        }
-    }
-}
diff --git a/app/Classes/Modules/Vouchers/Services/Voucherify/CreatesVoucherifyCustomer.php b/app/Classes/Modules/Vouchers/Services/Voucherify/CreatesVoucherifyCustomer.php
new file mode 100644
index 00000000..a15fe9c3
--- /dev/null
+++ b/app/Classes/Modules/Vouchers/Services/Voucherify/CreatesVoucherifyCustomer.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace App\Classes\Modules\Vouchers\Services\Voucherify;
+
+use Illuminate\Support\Facades\Log;
+use App\Classes\Modules\Vouchers\DataTransferObjects\CreateVoucherifyCustomerObject;
+
+class CreatesVoucherifyCustomer
+{
+
+    /** @var VoucherifyClient */
+    private $voucherifyClient;
+
+
+    /**
+     * CreatesVoucherifyCustomer constructor.
+     *
+     */
+    public function __construct()
+    {
+        $this->voucherifyClient = createVoucherifyClient();
+    }
+
+     /**
+     * @param CreateVoucherifyCustomerObject $object
+     * @return null|object
+     * @throws \Voucherify\ClientException
+     */
+    public function execute(CreateVoucherifyCustomerObject $object)
+    {
+        try {
+
+            $customerObj = [
+                "source_id" => $object->getUser()->id,
+                "name" => $object->getUser()->name,
+                "email" => $object->getUser()->email,
+                "address" => [
+                    "city" => '',
+                    "country" => '',
+                    "line_1" => '',
+                    "line_2" => '',
+                    "postal_code" => '',
+                    "state" => '',
+                ],
+            ];
+
+            if ($object->getIsNew()) {
+                $customerObj['metadata']["new_customer"] = date('Y-m-d H:i:s');
+            }
+            if ($object->getCompanyId()) {
+                $customerObj['metadata']["exchange_company_id"] = $object->getCompanyId();
+                $customerObj['metadata']["exchange_user_id"] = $object->getUser()->id;
+            }
+            if ($object->getAcquisitionChannel()) {
+                $customerObj['metadata']["acquisition"] = $object->getAcquisitionChannel();
+            }
+
+            $result = $this->voucherifyClient->customers->create($customerObj);
+            return $result;
+        } catch (\Voucherify\ClientException $e) {
+            // throw $e;
+            Log::error($e);
+            return null;
+        }
+    }
+}
diff --git a/app/Classes/Modules/Vouchers/Services/Voucherify/CreatesVoucherifyOrder.php b/app/Classes/Modules/Vouchers/Services/Voucherify/CreatesVoucherifyOrder.php
new file mode 100644
index 00000000..e5e6d404
--- /dev/null
+++ b/app/Classes/Modules/Vouchers/Services/Voucherify/CreatesVoucherifyOrder.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace App\Classes\Modules\Vouchers\Services\Voucherify;
+
+use Illuminate\Support\Facades\Log;
+use App\Classes\Modules\Vouchers\DataTransferObjects\CreateVoucherifyOrderObject;
+
+class CreatesVoucherifyOrder
+{
+
+    /** @var VoucherifyClient */
+    private $voucherifyClient;
+
+
+    /**
+     * CreatesVoucherifyOrder constructor.
+     *
+     */
+    public function __construct()
+    {
+        $this->voucherifyClient = createVoucherifyClient();
+    }
+
+
+    /**
+     * @param CreateVoucherifyOrderObject $obj
+     * @return null|object
+     * @throws \Voucherify\ClientException
+     */
+    public function execute(CreateVoucherifyOrderObject $obj)
+    {
+        try {
+            $orderObj = [
+                "customer" => [
+                    "source_id" => $obj->getEmployee()->id,
+                    "name" => $obj->getEmployee()->name,
+                    "email" => $obj->getEmployee()->email,
+                    "metadata" => [
+                        "exchange_company_id" => $obj->getCompanyId(),
+                        "exchange_user_id" => $obj->getEmployee()->id
+                    ]
+                ],
+                "amount" => $obj->getAmount() * 100, //converting it to cents
+            ];
+
+            if ($obj->getIsNoVoucher()) {
+                $orderObj['metadata']["no_voucher"] = true;
+            }
+
+            if ($obj->getIsTopUpWallet()) {
+                $orderObj['metadata']["is_wallet_top_up"] = true;
+            }
+
+            $result = $this->voucherifyClient->orders->create($orderObj);
+            return $result;
+        } catch (\Voucherify\ClientException $e) {
+            Log::error($e);
+            return null;
+        }
+    }
+}
diff --git a/app/Classes/Modules/Vouchers/Services/Voucherify/CreatesVoucherifyVoucher.php b/app/Classes/Modules/Vouchers/Services/Voucherify/CreatesVoucherifyVoucher.php
new file mode 100644
index 00000000..f3d14bb7
--- /dev/null
+++ b/app/Classes/Modules/Vouchers/Services/Voucherify/CreatesVoucherifyVoucher.php
@@ -0,0 +1,59 @@
+<?php
+
+namespace App\Classes\Modules\Vouchers\Services\Voucherify;
+
+use App\Models\User;
+use Illuminate\Support\Str;
+use Illuminate\Support\Facades\Log;
+use Carbon\Carbon;
+
+class CreatesVoucherifyVoucher
+{
+
+    /** @var VoucherifyClient */
+    private $voucherifyClient;
+
+
+    /**
+     * CreatesVoucherifyVoucher constructor.
+     *
+     */
+    public function __construct()
+    {
+        $this->voucherifyClient = createVoucherifyClient();
+    }
+
+     /**
+     * @param User $user
+     * @param int $amount
+     * @return null|object
+     * @throws \Voucherify\ClientException
+     */
+    public function execute(User $user, int $amount)
+    {
+        $startDate = Carbon::now();
+        $expirationDate = $startDate->copy()->addMonths(12)->endOfDay();
+        try {
+            $result = $this->voucherifyClient->vouchers->create([
+                "code" => Str::random(10),
+                "type" => "DISCOUNT_VOUCHER",
+                "discount" => [
+                    "type" => "AMOUNT",
+                    "amount_off" => $amount * 100,
+                ],
+                "redemption" => [
+                    "quantity" => 1
+                ],
+                "metadata" => [
+                    "email" => $user->email
+                ],
+                "start_date" => $startDate->format('Y-m-d H:i:s'),
+                "expiration_date" => $expirationDate->format('Y-m-d H:i:s')
+            ]);
+            return $result;
+        } catch (\Voucherify\ClientException $e) {
+            Log::error($e);
+            return null;
+        }
+    }
+}
diff --git a/app/Classes/Modules/Vouchers/Services/Voucherify/FetchesVoucherifyVoucher.php b/app/Classes/Modules/Vouchers/Services/Voucherify/FetchesVoucherifyVoucher.php
new file mode 100644
index 00000000..8c4d33b7
--- /dev/null
+++ b/app/Classes/Modules/Vouchers/Services/Voucherify/FetchesVoucherifyVoucher.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace App\Classes\Modules\Vouchers\Services\Voucherify;
+
+use App\Models\User;
+use Illuminate\Support\Facades\Log;
+
+class FetchesVoucherifyVoucher
+{
+
+    /** @var VoucherifyClient */
+    private $voucherifyClient;
+
+
+    /**
+     * FetchesVoucherifyVoucher constructor.
+     *
+     */
+    public function __construct()
+    {
+        $this->voucherifyClient = createVoucherifyClient();
+    }
+
+     /**
+     * @param User $user
+     * @param string $voucherifyVoucherCode
+     * @return null|object
+     * @throws \Voucherify\ClientException
+     */
+    public function execute(User $user, string $voucherifyVoucherCode)
+    {
+        try {
+            $result = $this->voucherifyClient->vouchers->get($voucherifyVoucherCode);
+
+            if (isset($result->metadata) && isset($result->metadata->email)) {
+                if($user->email != $result->metadata->email){
+                    $result->reason = 'Invalid Code';
+                }
+            }
+
+            return $result;
+        } catch (\Voucherify\ClientException $e) {
+            Log::error($e);
+            return null;
+        }
+    }
+}
diff --git a/app/Classes/Modules/Vouchers/Services/Voucherify/RedeemsVoucherifyVoucher.php b/app/Classes/Modules/Vouchers/Services/Voucherify/RedeemsVoucherifyVoucher.php
new file mode 100644
index 00000000..bd12e27f
--- /dev/null
+++ b/app/Classes/Modules/Vouchers/Services/Voucherify/RedeemsVoucherifyVoucher.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace App\Classes\Modules\Vouchers\Services\Voucherify;
+
+use App\Classes\Modules\Vouchers\DataTransferObjects\RedeemVoucherifyVoucherObject;
+
+class RedeemsVoucherifyVoucher
+{
+
+    /** @var VoucherifyClient */
+    private $voucherifyClient;
+
+
+    /**
+     * RedeemsVoucherifyVoucher constructor.
+     *
+     */
+    public function __construct()
+    {
+        $this->voucherifyClient = createVoucherifyClient();
+    }
+
+     /**
+     * @param RedeemVoucherifyVoucherObject $redeemVoucherifyVoucherObject
+     * @return null|object
+     * @throws \Voucherify\ClientException
+     */
+    public function execute(RedeemVoucherifyVoucherObject $redeemVoucherifyVoucherObject)
+    {
+        try {
+            $result = $this->voucherifyClient->redemptions->redeem($redeemVoucherifyVoucherObject->getPromoCode(), [
+                "customer" => [
+                    "source_id" => $redeemVoucherifyVoucherObject->getEmployee()->id,
+                    "name" => $redeemVoucherifyVoucherObject->getEmployee()->name,
+                    "email" => $redeemVoucherifyVoucherObject->getEmployee()->email,
+                    "metadata" => [
+                        "exchange_company_id" => $redeemVoucherifyVoucherObject->getCompanyId(),
+                        "exchange_user_id" => $redeemVoucherifyVoucherObject->getEmployee()->id
+                    ]
+                ],
+                "order" => [
+                    "amount" => $redeemVoucherifyVoucherObject->getAmount() * 100  //converting it to cents
+                ]
+            ]);
+            return $result;
+        } catch (\Voucherify\ClientException $e) {
+            throw $e;
+        }
+    }
+}
diff --git a/app/Classes/Modules/Vouchers/Services/Voucherify/UpdatesVoucherifyOrder.php b/app/Classes/Modules/Vouchers/Services/Voucherify/UpdatesVoucherifyOrder.php
new file mode 100644
index 00000000..80aae605
--- /dev/null
+++ b/app/Classes/Modules/Vouchers/Services/Voucherify/UpdatesVoucherifyOrder.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Classes\Modules\Vouchers\Services\Voucherify;
+
+use Illuminate\Support\Facades\Log;
+use App\Classes\Modules\Vouchers\DataTransferObjects\UpdateVoucherifyOrderObject;
+
+class UpdatesVoucherifyOrder
+{
+
+    /** @var VoucherifyClient */
+    private $voucherifyClient;
+
+
+    /**
+     * UpdatesVoucherifyOrder constructor.
+     *
+     */
+    public function __construct()
+    {
+        $this->voucherifyClient = createVoucherifyClient();
+    }
+
+
+    /**
+     * @param UpdateVoucherifyOrderObject $obj
+     * @return null|object
+     * @throws \Voucherify\ClientException
+     */
+    public function execute(UpdateVoucherifyOrderObject $obj)
+    {
+        try {
+            $result = $this->voucherifyClient->orders->update([
+                "id" => $obj->getId(),
+                "status" => $obj->getStatus(),
+            ]);
+            return $result;
+        } catch (\Voucherify\ClientException $e) {
+            Log::error($e);
+            return null;
+        }
+    }
+}
diff --git a/app/Classes/Modules/Vouchers/Services/Voucherify/ValidatesVoucherifyVoucher.php b/app/Classes/Modules/Vouchers/Services/Voucherify/ValidatesVoucherifyVoucher.php
new file mode 100644
index 00000000..3fa322d5
--- /dev/null
+++ b/app/Classes/Modules/Vouchers/Services/Voucherify/ValidatesVoucherifyVoucher.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace App\Classes\Modules\Vouchers\Services\Voucherify;
+
+use Illuminate\Support\Facades\Log;
+use App\Classes\Modules\Vouchers\DataTransferObjects\ValidateVoucherifyVoucherObject;
+use App\Classes\General\Helper;
+
+class ValidatesVoucherifyVoucher
+{
+
+    /** @var VoucherifyClient */
+    private $voucherifyClient;
+
+
+    /**
+     * ValidatesVoucherifyVoucher constructor.
+     *
+     */
+    public function __construct()
+    {
+        $this->voucherifyClient = createVoucherifyClient();
+    }
+
+     /**
+     * @param ValidateVoucherifyVoucherObject $validateVoucherifyVoucherObject
+     * @return null|object
+     * @throws \Voucherify\ClientException
+     */
+    public function execute(ValidateVoucherifyVoucherObject $validateVoucherifyVoucherObject)
+    {
+        try {
+            $validateVoucherObj = [
+                "customer" => [
+                    "source_id" => $validateVoucherifyVoucherObject->getUser()->id,
+                    "name" => $validateVoucherifyVoucherObject->getUser()->name,
+                    "email" => $validateVoucherifyVoucherObject->getUser()->email,
+                    "metadata" => [
+                        "exchange_company_id" => $validateVoucherifyVoucherObject->getCompanyId(),
+                        "exchange_user_id" => $validateVoucherifyVoucherObject->getUser()->id
+                    ]
+                ]
+            ];
+            if ($validateVoucherifyVoucherObject->getAmount()) {
+                $validateVoucherObj['order'] = [
+                    "amount" => $validateVoucherifyVoucherObject->getAmount() * 100 //converting it to cents
+                ];
+            }
+
+            $result = $this->voucherifyClient->validations->validateVoucher($validateVoucherifyVoucherObject->getVoucherCode(), $validateVoucherObj);
+
+            if (isset($result->metadata) && isset($result->metadata->email)) {
+                if($validateVoucherifyVoucherObject->getUser()->email != $result->metadata->email){
+                    $result->reason = 'Invalid Code';
+                }
+            }
+
+            if (isset($result->reason)) {
+                Helper::debugLogger('ValidatesVoucherifyVoucher error: '. $result->reason);
+                $result->reason = 'Invalid Code';
+            }
+
+            return $result;
+        } catch (\Voucherify\ClientException $e) {
+            // throw $e;
+            Log::error($e);
+            return null;
+        }
+    }
+}
diff --git a/app/Classes/Modules/Wallets/ControllersLogic/TopUpWalletLogic.php b/app/Classes/Modules/Wallets/ControllersLogic/TopUpWalletLogic.php
index c60cbf54..86e344ec 100644
--- a/app/Classes/Modules/Wallets/ControllersLogic/TopUpWalletLogic.php
+++ b/app/Classes/Modules/Wallets/ControllersLogic/TopUpWalletLogic.php
@@ -13,6 +13,7 @@ use App\Classes\Modules\Wallets\Services\GeneratesWalletCode;
 use App\Classes\Modules\Transactions\Services\GeneratesTransactionBillNumber;
 use App\Classes\Modules\Billplzs\Services\CreatesBillplzBill;
 use App\Classes\Modules\Transactions\Services\CreatesTransaction;
+use App\Classes\Modules\Vouchers\Processors\Voucherify\BookingToVoucherifyProcessor;
 use App\Classes\ValueObjects\Constants\TransactionType;
 use App\Classes\ValueObjects\Constants\PaymentMethodType;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
@@ -56,6 +57,8 @@ class TopUpWalletLogic extends AbstractControllerLogic
     /** @var CreatesTransaction */
     private $createsTransaction;
 
+    /** @var BookingToVoucherifyProcessor */
+    private $bookingToVoucherifyProcessor;
 
     /**
      * TopUpWalletLogic constructor.
@@ -65,8 +68,9 @@ class TopUpWalletLogic extends AbstractControllerLogic
      * @param GeneratesTransactionBillNumber $generatesTransactionBillNumber
      * @param CreatesBillplzBill $createsBillplzBill
      * @param CreatesTransaction $createsTransaction
+     * @param BookingToVoucherifyProcessor $bookingToVoucherifyProcessor
      */
-    public function __construct(FetchesCompany $fetchesCompany, GeneratesWalletCode $generatesWalletCode, CreatesWallet $createsWallet, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CreatesBillplzBill $createsBillplzBill, CreatesTransaction $createsTransaction)
+    public function __construct(FetchesCompany $fetchesCompany, GeneratesWalletCode $generatesWalletCode, CreatesWallet $createsWallet, GeneratesTransactionBillNumber $generatesTransactionBillNumber, CreatesBillplzBill $createsBillplzBill, CreatesTransaction $createsTransaction, BookingToVoucherifyProcessor $bookingToVoucherifyProcessor)
     {
         $this->fetchesCompany = $fetchesCompany;
         $this->generatesWalletCode = $generatesWalletCode;
@@ -74,6 +78,7 @@ class TopUpWalletLogic extends AbstractControllerLogic
         $this->generatesTransactionBillNumber = $generatesTransactionBillNumber;
         $this->createsBillplzBill = $createsBillplzBill;
         $this->createsTransaction = $createsTransaction;
+        $this->bookingToVoucherifyProcessor = $bookingToVoucherifyProcessor;
     }
 
     /**
@@ -108,6 +113,8 @@ class TopUpWalletLogic extends AbstractControllerLogic
 
         $transaction = $this->createsTransaction->execute($wallet, $transaction_object);
 
+        $this->bookingToVoucherifyProcessor->execute($company->employees()->first(), $transaction, $company->id, $amount, 0);
+
         return $this->resourceResponse(new WalletTransactionResource($transaction));
     }
 }
diff --git a/app/Classes/ValueObjects/Constants/MilestoneCreationOptions.php b/app/Classes/ValueObjects/Constants/MilestoneCreationOptions.php
new file mode 100644
index 00000000..4631b25b
--- /dev/null
+++ b/app/Classes/ValueObjects/Constants/MilestoneCreationOptions.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Classes\ValueObjects\Constants;
+
+class MilestoneCreationOptions
+{
+    const OPTIONS_MILESTONE_NAME= [
+        ['text' => 'MILESTONE 1', 'id' => Milestones::MILESTONE_1],
+        ['text' => 'MILESTONE 2', 'id' => Milestones::MILESTONE_2],
+        ['text' => 'MILESTONE 3', 'id' => Milestones::MILESTONE_3],
+        // ['text' => 'MILESTONE 4', 'id' => Milestones::MILESTONE_4],
+        // ['text' => 'MILESTONE 5', 'id' => Milestones::MILESTONE_5],
+        // ['text' => 'MILESTONE 6', 'id' => Milestones::MILESTONE_6],
+        // ['text' => 'MILESTONE 7', 'id' => Milestones::MILESTONE_7],
+        // ['text' => 'MILESTONE 8', 'id' => Milestones::MILESTONE_8],
+        // ['text' => 'MILESTONE 9', 'id' => Milestones::MILESTONE_9],
+        // ['text' => 'MILESTONE 10', 'id' => Milestones::MILESTONE_10],
+    ];
+}
diff --git a/app/Classes/ValueObjects/Constants/Milestones.php b/app/Classes/ValueObjects/Constants/Milestones.php
new file mode 100644
index 00000000..19961d68
--- /dev/null
+++ b/app/Classes/ValueObjects/Constants/Milestones.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Classes\ValueObjects\Constants;
+
+class Milestones
+{
+    public const MILESTONE_1 = 'MILESTONE 1'; //Authentication (Sign in) or CreateCustomerLogic (Sign up)
+    public const MILESTONE_2 = 'MILESTONE 2'; //Create Identification Document
+    public const MILESTONE_3 = 'MILESTONE 3'; //Assign Company to Segment Logic -segment.assign when accept 1688
+    // public const MILESTONE_4 = 'MILESTONE 4'; //Create Bank Logic (Transfer Now from dashboard)
+    // public const MILESTONE_5 = 'MILESTONE 5'; //Create Booking Logic
+    // public const MILESTONE_6 = 'MILESTONE 6'; //Create Address Logic (At transfer page before create booking)
+    // public const MILESTONE_7 = 'MILESTONE 7';
+    // public const MILESTONE_8 = 'MILESTONE 8';
+    // public const MILESTONE_9 = 'MILESTONE 9';
+    // public const MILESTONE_10 = 'MILESTONE 10';
+}
diff --git a/app/Classes/ValueObjects/Constants/RewardCreationOptions.php b/app/Classes/ValueObjects/Constants/RewardCreationOptions.php
new file mode 100644
index 00000000..c67dde49
--- /dev/null
+++ b/app/Classes/ValueObjects/Constants/RewardCreationOptions.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Classes\ValueObjects\Constants;
+
+class RewardCreationOptions
+{
+    const OPTIONS_IS_ACTIVE = [
+        ['text' => 'No', 'id' => 0],
+        ['text' => 'Yes', 'id' => 1],
+    ];
+
+    const OPTIONS_TYPE = [
+        ['text' => 'User Specific', 'id' => RewardType::REWARD_INDIVIDUAL],
+        ['text' => 'Amount', 'id' => RewardType::REWARD_AMOUNT],
+        ['text' => 'Code', 'id' => RewardType::REWARD_CODE],
+    ];
+}
diff --git a/app/Classes/ValueObjects/Constants/RewardType.php b/app/Classes/ValueObjects/Constants/RewardType.php
new file mode 100644
index 00000000..1add2ecd
--- /dev/null
+++ b/app/Classes/ValueObjects/Constants/RewardType.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Classes\ValueObjects\Constants;
+
+class RewardType
+{
+    public const REWARD_INDIVIDUAL = 1;
+    public const REWARD_AMOUNT = 2;
+    public const REWARD_CODE = 3;
+}
diff --git a/app/Classes/ValueObjects/Constants/VoucherifyEntityType.php b/app/Classes/ValueObjects/Constants/VoucherifyEntityType.php
new file mode 100644
index 00000000..e9e0a061
--- /dev/null
+++ b/app/Classes/ValueObjects/Constants/VoucherifyEntityType.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Classes\ValueObjects\Constants;
+
+final class VoucherifyEntityType {
+
+    public const ORDER = 'order';
+
+    public const CUSTOMER = 'customer';
+}
diff --git a/app/Http/Controllers/Milestones/CreateMilestoneController.php b/app/Http/Controllers/Milestones/CreateMilestoneController.php
new file mode 100644
index 00000000..d5d2ba0c
--- /dev/null
+++ b/app/Http/Controllers/Milestones/CreateMilestoneController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Milestones;
+
+use App\Classes\Modules\Milestones\ControllersLogic\CreateMilestoneLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreateMilestoneController
+{
+    /**
+     * @param Request $request
+     * @param CreateMilestoneLogic $logic
+     * @return JsonResponse
+     */
+    public function create(Request $request, CreateMilestoneLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
diff --git a/app/Http/Controllers/Milestones/DeleteMilestoneController.php b/app/Http/Controllers/Milestones/DeleteMilestoneController.php
new file mode 100644
index 00000000..084ff35e
--- /dev/null
+++ b/app/Http/Controllers/Milestones/DeleteMilestoneController.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Http\Controllers\Milestones;
+
+use App\Classes\Modules\Milestones\ControllersLogic\DeleteMilestoneLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class DeleteMilestoneController
+{
+    /**
+     * @param Request $request
+     * @param DeleteMilestoneLogic $logic
+     * @return JsonResponse
+     */
+    public function delete(Request $request, DeleteMilestoneLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+}
diff --git a/app/Http/Controllers/Milestones/ListMilestoneProgressController.php b/app/Http/Controllers/Milestones/ListMilestoneProgressController.php
new file mode 100644
index 00000000..03e2aa10
--- /dev/null
+++ b/app/Http/Controllers/Milestones/ListMilestoneProgressController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Milestones;
+
+use App\Classes\Modules\Milestones\ControllersLogic\ListMilestoneProgressLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ListMilestoneProgressController
+{
+    /**
+     * @param Request $request
+     * @param ListMilestoneProgressLogic $logic
+     * @return JsonResponse
+     */
+    public function list(Request $request, ListMilestoneProgressLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
diff --git a/app/Http/Controllers/Milestones/ListMilestonesController.php b/app/Http/Controllers/Milestones/ListMilestonesController.php
new file mode 100644
index 00000000..b592c0d4
--- /dev/null
+++ b/app/Http/Controllers/Milestones/ListMilestonesController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Milestones;
+
+use App\Classes\Modules\Milestones\ControllersLogic\ListMilestonesLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ListMilestonesController
+{
+    /**
+     * @param Request $request
+     * @param ListMilestonesLogic $logic
+     * @return JsonResponse
+     */
+    public function list(Request $request, ListMilestonesLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
diff --git a/app/Http/Controllers/Milestones/UpdateMilestoneController.php b/app/Http/Controllers/Milestones/UpdateMilestoneController.php
new file mode 100644
index 00000000..e3dce17d
--- /dev/null
+++ b/app/Http/Controllers/Milestones/UpdateMilestoneController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Milestones;
+
+use App\Classes\Modules\Milestones\ControllersLogic\UpdateMilestoneLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class UpdateMilestoneController
+{
+    /**
+     * @param Request $request
+     * @param UpdateMilestoneLogic $logic
+     * @return JsonResponse
+     */
+    public function update(Request $request, UpdateMilestoneLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
diff --git a/app/Http/Controllers/Rewards/CreateRewardController.php b/app/Http/Controllers/Rewards/CreateRewardController.php
new file mode 100644
index 00000000..55ea98c9
--- /dev/null
+++ b/app/Http/Controllers/Rewards/CreateRewardController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Rewards;
+
+use App\Classes\Modules\Rewards\ControllersLogic\CreateRewardLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CreateRewardController
+{
+    /**
+     * @param Request $request
+     * @param CreateRewardLogic $logic
+     * @return JsonResponse
+     */
+    public function create(Request $request, CreateRewardLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
diff --git a/app/Http/Controllers/Rewards/DeleteRewardController.php b/app/Http/Controllers/Rewards/DeleteRewardController.php
new file mode 100644
index 00000000..bc8e90e9
--- /dev/null
+++ b/app/Http/Controllers/Rewards/DeleteRewardController.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Http\Controllers\Rewards;
+
+use App\Classes\Modules\Rewards\ControllersLogic\DeleteRewardLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class DeleteRewardController
+{
+    /**
+     * @param Request $request
+     * @param DeleteRewardLogic $logic
+     * @return JsonResponse
+     */
+    public function delete(Request $request, DeleteRewardLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+}
diff --git a/app/Http/Controllers/Rewards/ListRewardsController.php b/app/Http/Controllers/Rewards/ListRewardsController.php
new file mode 100644
index 00000000..2d02d898
--- /dev/null
+++ b/app/Http/Controllers/Rewards/ListRewardsController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Rewards;
+
+use App\Classes\Modules\Rewards\ControllersLogic\ListRewardsLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ListRewardsController
+{
+    /**
+     * @param Request $request
+     * @param ListRewardsLogic $logic
+     * @return JsonResponse
+     */
+    public function list(Request $request, ListRewardsLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
diff --git a/app/Http/Controllers/Rewards/ListRewardsDetailsController.php b/app/Http/Controllers/Rewards/ListRewardsDetailsController.php
new file mode 100644
index 00000000..bd853b00
--- /dev/null
+++ b/app/Http/Controllers/Rewards/ListRewardsDetailsController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Rewards;
+
+use App\Classes\Modules\Rewards\ControllersLogic\ListRewardsDetailsLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ListRewardsDetailsController
+{
+    /**
+     * @param Request $request
+     * @param ListRewardsDetailsLogic $logic
+     * @return JsonResponse
+     */
+    public function list(Request $request, ListRewardsDetailsLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
diff --git a/app/Http/Controllers/Vouchers/RedeemVoucherController.php b/app/Http/Controllers/Vouchers/CreateVoucherController.php
similarity index 57%
rename from app/Http/Controllers/Vouchers/RedeemVoucherController.php
rename to app/Http/Controllers/Vouchers/CreateVoucherController.php
index 8657846f..f89c93ac 100644
--- a/app/Http/Controllers/Vouchers/RedeemVoucherController.php
+++ b/app/Http/Controllers/Vouchers/CreateVoucherController.php
@@ -2,18 +2,18 @@
 
 namespace App\Http\Controllers\Vouchers;
 
-use App\Classes\Modules\Vouchers\ControllersLogic\RedeemVoucherLogic;
+use App\Classes\Modules\Vouchers\ControllersLogic\CreateVoucherLogic;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 
-class RedeemVoucherController
+class CreateVoucherController
 {
     /**
      * @param Request $request
-     * @param RedeemVoucherLogic $logic
+     * @param CreateVoucherLogic $logic
      * @return JsonResponse
      */
-    public function redeem(Request $request, RedeemVoucherLogic $logic): JsonResponse {
+    public function create(Request $request, CreateVoucherLogic $logic): JsonResponse {
         return $logic->execute($request);
     }
 
diff --git a/app/Http/Controllers/Vouchers/ListUserVouchersController.php b/app/Http/Controllers/Vouchers/ListUserVouchersController.php
new file mode 100644
index 00000000..df8cb610
--- /dev/null
+++ b/app/Http/Controllers/Vouchers/ListUserVouchersController.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Http\Controllers\Vouchers;
+
+use App\Classes\Modules\Vouchers\ControllersLogic\ListUserVouchersLogic;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class ListUserVouchersController
+{
+    /**
+     * @param Request $request
+     * @param ListUserVoucherLogic $logic
+     * @return JsonResponse
+     */
+    public function list(Request $request, ListUserVouchersLogic $logic): JsonResponse {
+        return $logic->execute($request);
+    }
+
+}
diff --git a/app/Http/Resources/MilestoneProgressResource.php b/app/Http/Resources/MilestoneProgressResource.php
new file mode 100644
index 00000000..ed4c465f
--- /dev/null
+++ b/app/Http/Resources/MilestoneProgressResource.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class MilestoneProgressResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        return [
+            'id' => $this->id,
+            'milestone_id' => $this->milestone_id,
+            'created_at' => $this->created_at
+        ];
+    }
+}
diff --git a/app/Http/Resources/MilestoneResource.php b/app/Http/Resources/MilestoneResource.php
new file mode 100644
index 00000000..f336f937
--- /dev/null
+++ b/app/Http/Resources/MilestoneResource.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class MilestoneResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        $rewardIds = $this->rewards->pluck('id')->map(function ($id) {
+            return (int) $id;
+        })->toArray();
+
+        return [
+            'id' => $this->id,
+            'name' => $this->name,
+            'description' => $this->description,
+            'reward_ids' =>  $rewardIds
+        ];
+    }
+}
diff --git a/app/Http/Resources/MilestoneWIthMiltestoneProgressResource.php b/app/Http/Resources/MilestoneWIthMiltestoneProgressResource.php
new file mode 100644
index 00000000..4b4176b6
--- /dev/null
+++ b/app/Http/Resources/MilestoneWIthMiltestoneProgressResource.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+use Illuminate\Support\Facades\Auth;
+
+class MilestoneWIthMiltestoneProgressResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        $userId = $request->route('user_id');
+        if(!$userId){
+            $userId = Auth::user()->id;
+        }
+
+        return [
+            'id' => $this->id,
+            'name' => $this->name,
+            'description' => $this->description,
+            'milestone_progress' => new MilestoneProgressResource($this->progress->where('user_id', $userId)->first()),
+        ];
+    }
+}
diff --git a/app/Http/Resources/RewardDetailsResource.php b/app/Http/Resources/RewardDetailsResource.php
new file mode 100644
index 00000000..211ee4da
--- /dev/null
+++ b/app/Http/Resources/RewardDetailsResource.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+use Illuminate\Support\Facades\Auth;
+
+class RewardDetailsResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        $userId = $request->route('user_id');
+        if(!$userId){
+            $userId = Auth::user()->id;
+        }
+
+        $userReward = $this->users->where('user_id', $userId)->first();
+
+        return [
+            'id' => $this->id,
+            'name' => $this->name,
+            'description' => $this->description,
+            'milestones' =>  $this->milestones,
+            'milestones_progress' => MilestoneWIthMiltestoneProgressResource::collection($this->milestones),
+            'user_rewards' => new UserRewardResource($userReward),
+            'voucher' => $userReward ? $userReward->voucher : null
+        ];
+    }
+}
diff --git a/app/Http/Resources/RewardResource.php b/app/Http/Resources/RewardResource.php
new file mode 100644
index 00000000..e400fc6a
--- /dev/null
+++ b/app/Http/Resources/RewardResource.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class RewardResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        return [
+            'id' => $this->id,
+            'name' => $this->name,
+            'description' => $this->description,
+            'is_active' => $this->is_active,
+            'type' => $this->type,
+            'value' => $this->value,
+            'order' => $this->order,
+            'milestones' => MilestoneResource::collection($this->milestones)
+        ];
+    }
+}
diff --git a/app/Http/Resources/UserRewardResource.php b/app/Http/Resources/UserRewardResource.php
new file mode 100644
index 00000000..ed693b4c
--- /dev/null
+++ b/app/Http/Resources/UserRewardResource.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class UserRewardResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        return [
+            'id' => $this->id,
+            'user_id' => $this->user_id,
+            'reward' => new RewardResource($this->reward),
+            'voucher' => new VoucherResource($this->voucher),
+            'created_at' => $this->created_at
+        ];
+    }
+}
diff --git a/app/Http/Resources/VoucherResource.php b/app/Http/Resources/VoucherResource.php
new file mode 100644
index 00000000..54193eeb
--- /dev/null
+++ b/app/Http/Resources/VoucherResource.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class VoucherResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        $filteredRedemptions = $this->redemptions->filter(function ($redemption) {
+            return $redemption->transaction && $redemption->transaction->owner;
+        });
+        return [
+            'id' => $this->id,
+            'name' => $this->name,
+            'code' => $this->code,
+            'type' => $this->type,
+            'value' => (float) $this->value,
+            'start_date' => $this->start_date,
+            'end_date' => $this->end_date,
+            'is_redeemed' => $filteredRedemptions->count() > 0
+        ];
+    }
+}
diff --git a/app/Models/Employee.php b/app/Models/Employee.php
index 65dab67d..6d133186 100644
--- a/app/Models/Employee.php
+++ b/app/Models/Employee.php
@@ -31,4 +31,13 @@ class Employee extends AbstractModel
     {
         return $this->hasOne(User::class, 'user_id', 'id');
     }
+
+    /**
+     * @return belongsToMany
+     */
+    public function milestones()
+    {
+        return  $this->belongsToMany(Milestone::class, 'milestone_progress', 'user_id', 'milestone_id')
+                ->withPivot('created_at');
+    }
 }
diff --git a/app/Models/Milestone.php b/app/Models/Milestone.php
new file mode 100644
index 00000000..391410cc
--- /dev/null
+++ b/app/Models/Milestone.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Models;
+use Illuminate\Database\Eloquent\SoftDeletes;
+
+class Milestone extends AbstractModel
+{
+    use SoftDeletes;
+
+    protected $table = 'milestones';
+    protected $dates = ['deleted_at'];
+
+    public function progress()
+    {
+        return $this->hasMany(MilestoneProgress::class, 'milestone_id');
+    }
+
+    public function rewards()
+    {
+        return $this->belongsToMany(Reward::class, MilestoneReward::class);
+    }
+}
diff --git a/app/Models/MilestoneProgress.php b/app/Models/MilestoneProgress.php
new file mode 100644
index 00000000..7e03cba0
--- /dev/null
+++ b/app/Models/MilestoneProgress.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\SoftDeletes;
+
+class MilestoneProgress extends AbstractModel
+{
+    use SoftDeletes;
+
+    protected $table = 'milestone_progress';
+    protected $dates = ['deleted_at'];
+
+     public function milestone()
+     {
+         return $this->belongsTo(Milestone::class, 'milestone_id');
+     }
+
+     public function user()
+     {
+         return $this->belongsTo(User::class, 'user_id');
+     }
+}
diff --git a/app/Models/MilestoneReward.php b/app/Models/MilestoneReward.php
new file mode 100644
index 00000000..1d5f04e3
--- /dev/null
+++ b/app/Models/MilestoneReward.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace App\Models;
+
+class MilestoneReward extends AbstractModel
+{
+    protected $table = 'milestone_reward';
+}
diff --git a/app/Models/Reward.php b/app/Models/Reward.php
new file mode 100644
index 00000000..7dbdc5a9
--- /dev/null
+++ b/app/Models/Reward.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\SoftDeletes;
+
+class Reward extends AbstractModel
+{
+    use SoftDeletes;
+
+    protected $table = 'rewards';
+    protected $dates = ['deleted_at'];
+
+    public function milestones()
+    {
+        return $this->belongsToMany(Milestone::class, MilestoneReward::class);
+    }
+
+    /**
+     * @return HasMany
+     */
+    public function users(): HasMany
+    {
+        return $this->HasMany(UserReward::class, 'reward_id', 'id');
+    }
+}
diff --git a/app/Models/Transaction.php b/app/Models/Transaction.php
index eba18ee5..05fbfde7 100644
--- a/app/Models/Transaction.php
+++ b/app/Models/Transaction.php
@@ -4,6 +4,7 @@ namespace App\Models;
 
 use App\Classes\General\Interfaces\Documentable;
 use App\Classes\General\Interfaces\Transactionable;
+use App\Classes\General\Interfaces\Voucherifiable;
 use App\Classes\General\Traits\LogData;
 use App\Classes\ValueObjects\Constants\ApprovalStatus;
 use App\Classes\ValueObjects\Constants\TransactionType;
@@ -19,7 +20,7 @@ use Illuminate\Database\Eloquent\Relations\MorphTo;
 use Staudenmeir\EloquentHasManyDeep\HasTableAlias;
 
 
-class Transaction extends AbstractModel implements Documentable, Transactionable
+class Transaction extends AbstractModel implements Documentable, Transactionable, Voucherifiable
 {
     use HasTableAlias;
     use SoftDeletes;
@@ -200,4 +201,13 @@ class Transaction extends AbstractModel implements Documentable, Transactionable
     {
         return $query->whereIn('status', [ApprovalStatus::APPROVED]);
     }
+
+    /**
+     * @return MorphMany
+     */
+    public function voucherifyEntities(): MorphMany
+    {
+        return $this->morphMany(VoucherEntityMapping::class, 'owner');
+    }
+
 }
diff --git a/app/Models/User.php b/app/Models/User.php
index 6f33fac5..4bc7ec17 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -2,8 +2,10 @@
 
 namespace App\Models;
 
+use App\Classes\General\Interfaces\Voucherifiable;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Database\Eloquent\Relations\MorphMany;
 use Illuminate\Database\Eloquent\Relations\HasOne;
 
 use Illuminate\Database\Eloquent\SoftDeletes;
@@ -23,7 +25,8 @@ class User extends AbstractModel implements
     JWTSubject,
     AuthenticatableContract,
     AuthorizableContract,
-    CanResetPasswordContract
+    CanResetPasswordContract,
+    Voucherifiable
 {
     use HasRoles, Notifiable, Authenticatable, Authorizable, CanResetPassword, MustVerifyEmail, SoftDeletes;
 
@@ -67,11 +70,35 @@ class User extends AbstractModel implements
         return $this->belongsToMany(Company::class, (new Employee())->getTable(), 'user_id', 'company_id');
     }
 
+    // /**
+    //  * @return HasMany
+    //  */
+    // public function redemptions(): HasMany
+    // {
+    //     return $this->HasMany(VoucherRedemption::class, 'user_id', 'id');
+    // }
+
     /**
      * @return HasMany
      */
-    public function redemptions(): HasMany
+    public function milestoneProgress(): HasMany
     {
-        return $this->HasMany(VoucherRedemption::class, 'user_id', 'id');
+        return $this->HasMany(MilestoneProgress::class, 'user_id', 'id');
+    }
+
+    /**
+     * @return MorphMany
+     */
+    public function voucherifyEntities(): MorphMany
+    {
+        return $this->morphMany(VoucherEntityMapping::class, 'owner');
+    }
+
+    /**
+     * @return HasMany
+     */
+    public function rewards(): HasMany
+    {
+        return $this->HasMany(UserReward::class, 'user_id', 'id');
     }
 }
diff --git a/app/Models/UserReward.php b/app/Models/UserReward.php
new file mode 100644
index 00000000..40309447
--- /dev/null
+++ b/app/Models/UserReward.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\SoftDeletes;
+
+class UserReward extends AbstractModel
+{
+    use SoftDeletes;
+
+    protected $table = 'user_rewards';
+    protected $dates = ['deleted_at'];
+
+    public function reward()
+    {
+        return $this->belongsTo(Reward::class, 'reward_id');
+    }
+
+    public function user()
+    {
+        return $this->belongsTo(User::class, 'user_id');
+    }
+
+    public function voucher()
+    {
+        return $this->belongsTo(Voucher::class, 'voucher_id');
+    }
+}
diff --git a/app/Models/VoucherEntityMapping.php b/app/Models/VoucherEntityMapping.php
new file mode 100644
index 00000000..2df0eacd
--- /dev/null
+++ b/app/Models/VoucherEntityMapping.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Relations\MorphTo;
+use Illuminate\Database\Eloquent\SoftDeletes;
+
+class VoucherEntityMapping extends AbstractModel
+{
+    use SoftDeletes;
+
+    protected $table = 'voucher_entity_mappings';
+    protected $dates = ['deleted_at'];
+
+    /**
+     * @return \Illuminate\Database\Eloquent\Relations\MorphTo
+     */
+    public function owner(): morphTo
+    {
+        return $this->morphTo();
+    }
+
+}
diff --git a/database/migrations/2023_06_12_191228_create_rewards_table.php b/database/migrations/2023_06_12_191228_create_rewards_table.php
new file mode 100644
index 00000000..04ea1133
--- /dev/null
+++ b/database/migrations/2023_06_12_191228_create_rewards_table.php
@@ -0,0 +1,38 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateRewardsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('rewards', function (Blueprint $table) {
+            $table->id();
+            $table->string('name');
+            $table->text('description')->nullable();
+            $table->boolean('is_active')->default(true);
+            $table->integer('type')->default(0);
+            $table->string('value');
+            $table->integer('order')->default(9999);
+            $table->softDeletes();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('rewards');
+    }
+}
diff --git a/database/migrations/2023_06_13_062800_create_milestones_table.php b/database/migrations/2023_06_13_062800_create_milestones_table.php
new file mode 100644
index 00000000..8785e734
--- /dev/null
+++ b/database/migrations/2023_06_13_062800_create_milestones_table.php
@@ -0,0 +1,37 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateMilestonesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('milestones', function (Blueprint $table) {
+            $table->id();
+            $table->string('name');
+            $table->string('description');
+            // $table->unsignedBigInteger('reward_id');
+            $table->softDeletes();
+            $table->timestamps();
+
+            // $table->foreign('reward_id')->references('id')->on('rewards')->onDelete('cascade');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('milestones');
+    }
+}
diff --git a/database/migrations/2023_06_13_213411_create_milestone_progress_table.php b/database/migrations/2023_06_13_213411_create_milestone_progress_table.php
new file mode 100644
index 00000000..3476eb5a
--- /dev/null
+++ b/database/migrations/2023_06_13_213411_create_milestone_progress_table.php
@@ -0,0 +1,39 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateMilestoneProgressTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('milestone_progress', function (Blueprint $table) {
+            $table->id();
+            // $table->unsignedBigInteger('company_id');
+            $table->unsignedBigInteger('user_id');
+            $table->unsignedBigInteger('milestone_id');
+            $table->softDeletes();
+            $table->timestamps();
+
+            // $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade');
+            $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade');
+            $table->foreign('milestone_id')->references('id')->on('milestones')->onDelete('cascade');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('milestone_progress');
+    }
+}
diff --git a/database/migrations/2023_06_20_192419_create_user_rewards_table.php b/database/migrations/2023_06_20_192419_create_user_rewards_table.php
new file mode 100644
index 00000000..42288a87
--- /dev/null
+++ b/database/migrations/2023_06_20_192419_create_user_rewards_table.php
@@ -0,0 +1,39 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateUserRewardsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('user_rewards', function (Blueprint $table) {
+            $table->id();
+            $table->unsignedBigInteger('user_id');
+            $table->unsignedBigInteger('reward_id');
+            $table->unsignedBigInteger('voucher_id');
+            $table->softDeletes();
+            $table->timestamps();
+
+            $table->foreign('user_id')->references('id')->on('users')->onDelete('cascade');
+            // $table->foreign('reward_id')->references('id')->on('rewards')->onDelete('cascade');
+            $table->foreign('voucher_id')->references('id')->on('vouchers')->onDelete('cascade');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('user_rewards');
+    }
+}
diff --git a/database/migrations/2023_07_02_210132_create_milestone_reward.php b/database/migrations/2023_07_02_210132_create_milestone_reward.php
new file mode 100644
index 00000000..2a00d7df
--- /dev/null
+++ b/database/migrations/2023_07_02_210132_create_milestone_reward.php
@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateMilestoneReward extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('milestone_reward', function (Blueprint $table) {
+            $table->unsignedBigInteger('milestone_id');
+            $table->unsignedBigInteger('reward_id');
+            // $table->timestamps();
+
+            $table->foreign('milestone_id')->references('id')->on('milestones')->onDelete('cascade');
+            $table->foreign('reward_id')->references('id')->on('rewards')->onDelete('cascade');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('milestone_reward');
+    }
+}
diff --git a/database/migrations/2023_07_05_081135_create_voucher_entity_mappings.php b/database/migrations/2023_07_05_081135_create_voucher_entity_mappings.php
new file mode 100644
index 00000000..5bae07b0
--- /dev/null
+++ b/database/migrations/2023_07_05_081135_create_voucher_entity_mappings.php
@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateVoucherEntityMappings extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('voucher_entity_mappings', function (Blueprint $table) {
+            $table->id();
+            $table->string('owner_type');
+            $table->unsignedBigInteger('owner_id');
+            $table->string('voucherify_entity_type');
+            $table->string('voucherify_entity_id');
+            $table->softDeletes();
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('voucher_entity_mappings');
+    }
+}
diff --git a/database/migrations/2023_07_08_155628_add_start_date_and_end_date_to_vouchers_table.php b/database/migrations/2023_07_08_155628_add_start_date_and_end_date_to_vouchers_table.php
new file mode 100644
index 00000000..a88e8e0d
--- /dev/null
+++ b/database/migrations/2023_07_08_155628_add_start_date_and_end_date_to_vouchers_table.php
@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddStartDateAndEndDateToVouchersTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('vouchers', function (Blueprint $table) {
+            $table->timestamp('start_date')->nullable();
+            $table->timestamp('end_date')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('vouchers', function (Blueprint $table) {
+            $table->dropColumn(['start_date', 'end_date']);
+        });
+    }
+}
diff --git a/database/seeds/AdminUserPermissionsTableSeeder.php b/database/seeds/AdminUserPermissionsTableSeeder.php
index 132184d7..0c3d5acf 100644
--- a/database/seeds/AdminUserPermissionsTableSeeder.php
+++ b/database/seeds/AdminUserPermissionsTableSeeder.php
@@ -19,7 +19,7 @@ class AdminUserPermissionsTableSeeder extends Seeder
         app()['cache']->forget('spatie.permission.cache');
 
         // admin permissions
-        $permissions = [ 
+        $permissions = [
             ['name' => 'view document', 'guard_name' => 'web'],
             ['name' => 'add document', 'guard_name' => 'web'],
             ['name' => 'edit document', 'guard_name' => 'web'],
@@ -63,7 +63,14 @@ class AdminUserPermissionsTableSeeder extends Seeder
             ['name' => 'view booking', 'guard_name' => 'web'],
             ['name' => 'add booking', 'guard_name' => 'web'],
             ['name' => 'edit booking', 'guard_name' => 'web'],
-            ['name' => 'delete booking', 'guard_name' => 'web']
+            ['name' => 'delete booking', 'guard_name' => 'web'],
+
+            ['name' => 'add milestone', 'guard_name' => 'web'],
+            ['name' => 'add reward', 'guard_name' => 'web'],
+            ['name' => 'edit milestone', 'guard_name' => 'web'],
+            ['name' => 'delete milestone', 'guard_name' => 'web'],
+            ['name' => 'delete reward', 'guard_name' => 'web'],
+
         ];
 
         foreach ($permissions as $permission){
diff --git a/docker-setup/Dockerfile b/docker-setup/Dockerfile
index 13ce0249..71255f30 100644
--- a/docker-setup/Dockerfile
+++ b/docker-setup/Dockerfile
@@ -2,6 +2,8 @@ FROM php:7.4-fpm
 
 WORKDIR /var/www/html
 
+RUN pecl install xdebug-2.9.8 && docker-php-ext-enable xdebug
+
 RUN docker-php-ext-install pdo pdo_mysql
 
 RUN apt-get update && apt-get install -y \
@@ -25,4 +27,15 @@ RUN curl -sL https://deb.nodesource.com/setup_12.x | bash -
 RUN apt-get -y install nodejs
 
 RUN chown -R www-data:www-data /var/www
-RUN chmod 755 /var/www
\ No newline at end of file
+RUN chmod 755 /var/www
+
+# Configure xdebug
+RUN echo "xdebug.remote_enable=1" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
+RUN echo "xdebug.remote_autostart=1" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
+RUN echo "xdebug.remote_host=host.docker.internal" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
+RUN echo "xdebug.remote_port=9002" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
+RUN echo "xdebug.idekey=VSCODE" >> /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
+
+# Moved to docker-setup folder
+# RUN echo 'pm.max_children = 15' >> /usr/local/etc/php-fpm.d/zz-docker.conf && \
+#     echo 'pm.max_requests = 500' >> /usr/local/etc/php-fpm.d/zz-docker.conf
diff --git a/docker-setup/docker-compose.yml b/docker-setup/docker-compose.yml
index deb02207..4dcfa8c2 100644
--- a/docker-setup/docker-compose.yml
+++ b/docker-setup/docker-compose.yml
@@ -44,8 +44,7 @@ services:
     container_name: exchange-php
     volumes:
       - ../:/var/www/html
-    ports:
-      - "9002:9000"
+      - ./php/default.conf:/usr/local/etc/php-fpm.d/zz-docker.conf
     networks:
       - exchange-staging
   #################################################################
diff --git a/docker-setup/nginx/default.conf b/docker-setup/nginx/default.conf
index b594e701..c1811261 100644
--- a/docker-setup/nginx/default.conf
+++ b/docker-setup/nginx/default.conf
@@ -23,6 +23,13 @@ server {
         fastcgi_intercept_errors on;
         fastcgi_keep_conn on;
         fastcgi_param PHP_VALUE "auto_prepend_file= \n allow_url_include=Off";
+
+        # Xdebug configuration
+        # fastcgi_param XDEBUG_MODE debug;
+        # fastcgi_param XDEBUG_CLIENT_HOST host.docker.internal;
+        # fastcgi_param XDEBUG_CLIENT_PORT 9002;
+        # fastcgi_param XDEBUG_IDE_KEY VSCODE;
+
         proxy_send_timeout 3600;
         proxy_read_timeout 3600;
         fastcgi_send_timeout 3600;
diff --git a/docker-setup/php/default.conf b/docker-setup/php/default.conf
new file mode 100644
index 00000000..dced3233
--- /dev/null
+++ b/docker-setup/php/default.conf
@@ -0,0 +1,8 @@
+[global]
+daemonize = no
+
+[www]
+listen = 9000
+
+pm.max_children = 15
+pm.max_requests = 500
diff --git a/resources/assets/vue/components/bookings/elements/ListVouchers.vue b/resources/assets/vue/components/bookings/elements/ListVouchers.vue
new file mode 100644
index 00000000..e59ff653
--- /dev/null
+++ b/resources/assets/vue/components/bookings/elements/ListVouchers.vue
@@ -0,0 +1,81 @@
+<template>
+     <div class="row">
+        <div class="col">
+            <loading-component style="height: 100px; top: 0;" key="1" color="success" v-show="isLoading"></loading-component>
+            <div class="row text-left no-margin bg-white" v-if="!isLoading" v-for="item in vouchers" v-bind:key="item.id" >
+                <div id="select-option" name="select-option" class="col b-b b-grey p-t-10 p-b-10 pointer  p-t-10 p-b-10" @click="selectVoucher(item)">
+                    <div class="row parentContainer">
+                        <div class="col">
+                            <p>{{ item.voucher.code }}</p>
+                            <p v-if="item.voucher.type == 'AMOUNT'">RM{{ item.voucher.value/100 }} Discount</p>
+                            <p v-if="item.voucher.type == 'PERCENT'">{{ item.voucher.value }}% Discount</p>
+                        </div>
+                        <div class="col" v-if="item.voucher.end_date">
+                            Valid till {{ item.voucher.end_date }}
+                        </div>
+                        <div class="col" v-else>
+                            No expiry date
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+    export default {
+        props: {
+            section: {
+                type: String,
+                default: 'vouchersDropDownListSection',
+            },
+            isClicked: {
+                type: Boolean,
+                default: false,
+            },
+            employee: {
+                type: Object,
+                default: null
+            },
+        },
+        data(){
+            return {
+                vouchers: null,
+                isLoading: true,
+            }
+        },
+        computed: {
+            pendingQueue () {
+                return this.$store.getters.isInCompleteQueue(this.section);
+            },
+        },
+        watch: {
+            pendingQueue(inComplete){
+                if(inComplete){
+                    this.fetchVouchers();
+                }
+            },
+        },
+        created(){
+            this.$store.dispatch('updateListQueue', {'name': this.section});
+        },
+        methods: {
+            fetchVouchers(){
+                this.isLoading = true;
+                if(this.employee){
+                    this.submit(route('api.voucher.user.list') + '?filters=' + JSON.stringify( { 'has_active_reward':  this.employee.id} ), 'get', this.section, false, false);
+                }
+            },
+            successHandler(response){
+                this.isLoading = false;
+                this.$store.dispatch('completeList', {'name': this.section, 'data': []});
+                this.vouchers = response.payload.data;
+            },
+            selectVoucher(item){
+                this.$emit('selected-voucher', item.voucher.code);
+                this.closeModal();
+            },
+        }
+    }
+</script>
diff --git a/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue b/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue
index c9ababa4..71bf53d9 100644
--- a/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue
+++ b/resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue
@@ -244,9 +244,17 @@
                                                             <i class="fa fa-times muted"></i>
                                                         </div>
                                                     </div>
+                                                    <div class="col-auto p-r-10 p-l-10">
+                                                        <button class="btn btn-xs btn-outline-info b-rad-none m-r-5 requestModal" data-type="voucherList">
+                                                            <i class="fa fa-list"></i>
+                                                        </button>
+                                                    </div>
                                                 </div>
                                             </validation-wrapper-component>
                                         </div>
+                                        <modal-component id="choose-voucher-modal" class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="voucherList">
+                                            <list-vouchers :isClicked="!voucherListDropDownStatus" :employee="data.company.employee" @selected-voucher="handleSelectedVoucher"></list-vouchers>
+                                        </modal-component>
                                     </div>
                                     <span class="text-primary bold text-underline m-l-5 cursor text-small fs-12" style="margin-bottom: -10px; margin-top: -5px;" @click="showApplyVoucher=!showApplyVoucher" v-show="!showApplyVoucher">Apply a voucher</span>
                                     <div class="row m-l-0 m-r-0" style="height: 20px">
@@ -592,6 +600,7 @@
                 voucherValidated: false,
                 voucherIsChecking: false,
                 showApplyVoucher: false,
+                voucherListDropDownStatus: false,
             }
         },
         validations () {
@@ -677,7 +686,8 @@
                 this.voucherValidated = false;
                 this.parameters = {
                     voucherCode: this.voucherCode,
-                    amount: this.amount
+                    amount: this.amount,
+                    itemId: this.item.id
                 };
                 if(this.voucherCode.trim() !== ''){
                     this.submit(route('api.voucher.validate'), 'post', '', false, false);
@@ -691,6 +701,13 @@
                 this.voucherCodeFailedReason = '';
                 this.voucherValidated = false;
                 this.voucherCode = event.target.value;
+            },
+            toggleDropdown() {
+                this.voucherListDropDownStatus = !this.voucherListDropDownStatus;
+            },
+            handleSelectedVoucher(value){
+                this.voucherCode = value;
+                this.voucherListDropDownStatus = !this.voucherListDropDownStatus;
             }
         },
         mixins: [componentHandler],
diff --git a/resources/assets/vue/components/companies/elements/SingleRewardDetailsItemComponent.vue b/resources/assets/vue/components/companies/elements/SingleRewardDetailsItemComponent.vue
new file mode 100644
index 00000000..739cc262
--- /dev/null
+++ b/resources/assets/vue/components/companies/elements/SingleRewardDetailsItemComponent.vue
@@ -0,0 +1,29 @@
+<template>
+    <div class="card">
+        <div class="card-body">
+            <h5 class="card-title">{{ item.name }}</h5>
+            <p class="card-text">{{ item.description }}</p>
+            <p v-if="item.voucher && item.user_rewards.voucher.is_redeemed" class="text-secondary"> {{ item.voucher.code }}</p>
+            <p v-else-if="item.voucher" class="text-primary"> {{ item.voucher.code }}</p>
+            <p v-if="item.voucher.type == 'AMOUNT'">RM{{ item.voucher.value/100 }} Discount</p>
+            <p v-if="item.voucher.type == 'PERCENT'">{{ item.voucher.value }}% Discount</p>
+        </div>
+        <div class="card-footer text-muted">
+            <p v-if="item.user_rewards && item.user_rewards.voucher.is_redeemed">
+                Voucher claimed
+            </p>
+            <p v-else-if="item.voucher && item.voucher.end_date">
+                Valid till {{ item.voucher.end_date }}
+            </p>
+            <p v-else>
+                -
+            </p>
+        </div>
+    </div>
+</template>
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    export default {
+        mixins: [componentHandler]
+    }
+</script>
diff --git a/resources/assets/vue/components/companies/elements/SingleUserRewardItemComponent.vue b/resources/assets/vue/components/companies/elements/SingleUserRewardItemComponent.vue
new file mode 100644
index 00000000..8f25ab60
--- /dev/null
+++ b/resources/assets/vue/components/companies/elements/SingleUserRewardItemComponent.vue
@@ -0,0 +1,30 @@
+<template>
+    <div class="card">
+        <div class="card-body">
+            <h5 v-if="item.reward" class="card-title"> {{ item.reward.name }}</h5>
+            <h5 v-else="item.voucher" class="card-title"> {{ item.voucher.name }}</h5>
+            <p v-if="item.reward" class="card-text">{{ item.reward.description }}</p>
+            <p v-if="item.voucher && item.voucher.is_redeemed" class="text-secondary"> {{ item.voucher.code }}</p>
+            <p v-else class="text-primary"> {{ item.voucher.code }}</p>
+            <p v-if="item.voucher.type == 'AMOUNT'">RM{{ item.voucher.value/100 }} Discount</p>
+            <p v-if="item.voucher.type == 'PERCENT'">{{ item.voucher.value }}% Discount</p>
+        </div>
+        <div class="card-footer text-muted">
+            <p v-if="item.voucher && item.voucher.is_redeemed">
+                Voucher claimed
+            </p>
+            <p v-else-if="item.voucher && item.voucher.end_date">
+                Valid till {{ item.voucher.end_date }}
+            </p>
+            <p v-else>
+                -
+            </p>
+        </div>
+    </div>
+</template>
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    export default {
+        mixins: [componentHandler]
+    }
+</script>
diff --git a/resources/assets/vue/components/companies/sections/AddVoucherSectionComponent.vue b/resources/assets/vue/components/companies/sections/AddVoucherSectionComponent.vue
new file mode 100644
index 00000000..65b0c2ed
--- /dev/null
+++ b/resources/assets/vue/components/companies/sections/AddVoucherSectionComponent.vue
@@ -0,0 +1,106 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <div class="row">
+                <div class="col ml-md-3 ml-0 mt-md-0 mt-3 bg-white padding-15">
+                    <div class="row">
+                        <div class="col">
+                            <div class="row m-b-10">
+                                <div class="col">
+                                    <div class="font-heading fs-16 all-caps bold m-b-15">Add Voucher</div>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <div class="col">
+                                    <validation-wrapper-component :validator="$v.voucherCode">
+                                        <label>Voucher Code</label>
+                                        <input type="text" class="form-control" v-model="voucherCode">
+                                    </validation-wrapper-component>
+                                </div>
+                            </div>
+                            <div class="row m-l-0 m-r-0" style="height: 20px">
+                                <i class="fa fa-spinner fa-spin m-b-5" v-show="$store.getters.isLoading(section) && voucherIsChecking"></i>
+                                <span class="text-danger" v-if="voucherCodeFailedReason">{{ voucherCodeFailedReason }}</span>
+                                <span class="text-success" v-if="voucherCodeFailedReason === '' && voucherFetched">Voucher added</span>
+                            </div>
+                            <div class="row m-t-20">
+                                <div class="col">
+                                    <button type="button" class="btn btn-block p-t-10 p-b-10 p-r-35 p-l-35 btn-success b-rad-none" @click="submitForm">Add Voucher</button>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+    import { required } from "vuelidate/lib/validators";
+    export default {
+        props: {
+            id: {
+                type: String,
+                required: true
+            },
+            section:{
+                type: String,
+                required: true
+            }
+        },
+        data(){
+            return {
+                parameters: {
+                    voucherCode: '',
+                },
+                voucherCode: '',
+                voucherCodeFailedReason: '',
+                voucherFetched: false,
+                voucherIsChecking: false
+            }
+        },
+        validations: {
+            voucherCode: {
+                required
+            }
+        },
+        methods: {
+            successHandler(response){
+                if(response.payload.data && response.payload.data.voucher_id !== undefined){
+                    this.voucherFetched = true;
+                    this.$store.dispatch('reloadList', {'name': "customerVouchersListSection"});
+                    this.voucherCode = '';
+                    this.$v.$reset();
+                }
+                else{
+                    this.voucherFetched = false;
+                    if(response.payload.data && response.payload.data.reason){
+                        this.voucherCodeFailedReason = response.payload.data.reason;
+                    }
+                    else{
+                        this.voucherCodeFailedReason = 'Voucher Invalid';
+                    }
+                }
+                this.voucherIsChecking = false;
+            },
+            submitForm(){
+                this.reset();
+                this.voucherIsChecking = true;
+                this.parameters = {
+                    voucherCode: this.voucherCode,
+                    userId: this.id
+                };
+                this.submit(this.route('api.voucher.create'), 'post', this.section, false, false);
+            },
+            errorHandler(error){
+                this.voucherFetched = false;
+                this.voucherIsChecking = false;
+            },
+            reset(){
+                this.voucherFetched = false;
+                this.voucherCodeFailedReason = "";
+            }
+        }
+    }
+</script>
diff --git a/resources/assets/vue/components/companies/sections/CustomerRewardsAdminSectionComponent.vue b/resources/assets/vue/components/companies/sections/CustomerRewardsAdminSectionComponent.vue
new file mode 100644
index 00000000..7ba9b13d
--- /dev/null
+++ b/resources/assets/vue/components/companies/sections/CustomerRewardsAdminSectionComponent.vue
@@ -0,0 +1,119 @@
+<template>
+    <div class="row d-none" :class="[{'d-flex': $store.getters.isAdmin}]" v-if="$store.getters.isAdmin" >
+        <div class="col-md-12 col-lg col-xl">
+            <div class="row">
+                <div class="col">
+                    <div class="row tabsContainer">
+                        <div class="col">
+                            <div class="row m-l-0 m-r-0">
+                                <div class="col-6 col-md-8">
+                                    <div class="row">
+                                        <div class="col m-r-5">
+                                            <div class="row fs-12 text-center">
+                                                <div class="col p-t-20 p-b-20 bg-master-lighter active tabButton" tab-name="vouchers">
+                                                    <div class="row">
+                                                        <div class="col">
+                                                            <div class="fs-12 m-t-5">All Vouchers</div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="col m-r-5 d-none d-md-inline">
+                                            <div class="row fs-12 text-center">
+                                                <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="rewards">
+                                                    <div class="row">
+                                                        <div class="col">
+                                                            <div class="fs-12 m-t-5">Rewards Vouchers</div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="col m-r-5 d-none d-md-inline">
+                                            <div class="row fs-12 text-center">
+                                                <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="used">
+                                                    <div class="row">
+                                                        <div class="col">
+                                                            <div class="fs-12 m-t-5">Used Vouchers</div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row no-margin">
+                                <div class="col bg-white padding-25">
+                                    <div class="row tabsContainer tabContent active" tab-name="vouchers">
+                                        <div class="col">
+                                            <div class="row">
+                                                <div class="col">
+                                                    <div class="row">
+                                                        <div class="col" v-if="this.$store.getters.getUserId">
+                                                            <list-component section="customerVouchersListSection" :endpoint="route('api.voucher.user.list')" :options="{ 'has_active_reward': id }">
+                                                                <template slot="list" slot-scope="{data}">
+                                                                    <single-user-reward-item-component :data="data"></single-user-reward-item-component>
+                                                                </template>
+                                                            </list-component>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="row tabsContainer tabContent hide" tab-name="rewards">
+                                        <div class="col">
+                                            <div class="row">
+                                                <div class="col">
+                                                    <div class="row">
+                                                        <div class="col" v-if="this.$store.getters.getUserId">
+                                                            <list-component section="customerRewardsListSection" :endpoint="route('api.reward.list.details.admin', id)" :options="{'is_active_2': true, order_by:{ column:'order', DESC:false}}">
+                                                                <template slot="list" slot-scope="{data}">
+                                                                    <single-reward-details-item-component :data="data"></single-reward-details-item-component>
+                                                                </template>
+                                                            </list-component>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="row tabsContainer tabContent hide" tab-name="used">
+                                        <div class="col">
+                                            <div class="row">
+                                                <div class="col">
+                                                    <div class="row">
+                                                        <div class="col" v-if="this.$store.getters.getUserId">
+                                                            <list-component section="customerUsedVouchersListSection" :endpoint="route('api.voucher.user.list')" :options="{ 'has_used_voucher_for_admin': id }">
+                                                                <template slot="list" slot-scope="{data}">
+                                                                    <single-user-reward-item-component :data="data"></single-user-reward-item-component>
+                                                                </template>
+                                                            </list-component>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+    export default {
+        props: {
+            id: {
+                type: String,
+                required: true
+            }
+        }
+    }
+</script>
diff --git a/resources/assets/vue/components/companies/sections/CustomerRewardsSectionComponent.vue b/resources/assets/vue/components/companies/sections/CustomerRewardsSectionComponent.vue
new file mode 100644
index 00000000..28ed76cd
--- /dev/null
+++ b/resources/assets/vue/components/companies/sections/CustomerRewardsSectionComponent.vue
@@ -0,0 +1,112 @@
+<template>
+    <div class="row m-b-15 parentContainer">
+        <div class="col-md-12 col-lg col-xl">
+            <div class="row">
+                <div class="col">
+                    <div class="row tabsContainer">
+                        <div class="col">
+                            <div class="row m-l-0 m-r-0">
+                                <div class="col-6 col-md-8">
+                                    <div class="row">
+                                        <div class="col m-r-5">
+                                            <div class="row fs-12 text-center">
+                                                <div class="col p-t-20 p-b-20 bg-master-lighter active tabButton" tab-name="vouchers">
+                                                    <div class="row">
+                                                        <div class="col">
+                                                            <div class="fs-12 m-t-5">All Vouchers</div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="col m-r-5 d-none d-md-inline">
+                                            <div class="row fs-12 text-center">
+                                                <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="rewards">
+                                                    <div class="row">
+                                                        <div class="col">
+                                                            <div class="fs-12 m-t-5">Rewards Vouchers</div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="col m-r-5 d-none d-md-inline">
+                                            <div class="row fs-12 text-center">
+                                                <div class="col p-t-20 p-b-20 bg-master-lighter tabButton" tab-name="used">
+                                                    <div class="row">
+                                                        <div class="col">
+                                                            <div class="fs-12 m-t-5">Used Vouchers</div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row no-margin">
+                                <div class="col bg-white padding-25">
+                                    <div class="row tabsContainer tabContent active" tab-name="vouchers">
+                                        <div class="col">
+                                            <div class="row">
+                                                <div class="col">
+                                                    <div class="row">
+                                                        <div class="col" v-if="this.$store.getters.getUserId">
+                                                            <list-component section="customerVouchersListSection" :endpoint="route('api.voucher.user.list')" :options="{ 'has_active_reward': true }">
+                                                                <template slot="list" slot-scope="{data}">
+                                                                    <single-user-reward-item-component :data="data"></single-user-reward-item-component>
+                                                                </template>
+                                                            </list-component>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="row tabsContainer tabContent hide" tab-name="rewards">
+                                        <div class="col">
+                                            <div class="row">
+                                                <div class="col">
+                                                    <div class="row">
+                                                        <div class="col" v-if="this.$store.getters.getUserId">
+                                                            <list-component section="customerRewardsListSection" :endpoint="route('api.reward.list.details')" :options="{'is_active_2': true, order_by:{ column:'order', DESC:false}}">
+                                                                <template slot="list" slot-scope="{data}">
+                                                                    <single-reward-details-item-component :data="data"></single-reward-details-item-component>
+                                                                </template>
+                                                            </list-component>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="row tabsContainer tabContent hide" tab-name="used">
+                                        <div class="col">
+                                            <div class="row">
+                                                <div class="col">
+                                                    <div class="row">
+                                                        <div class="col" v-if="this.$store.getters.getUserId">
+                                                            <list-component section="customerUsedVouchersListSection" :endpoint="route('api.voucher.user.list')" :options="{ 'has_used_voucher': true }">
+                                                                <template slot="list" slot-scope="{data}">
+                                                                    <single-user-reward-item-component :data="data"></single-user-reward-item-component>
+                                                                </template>
+                                                            </list-component>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+    export default {}
+</script>
diff --git a/resources/assets/vue/components/general/forms/SelectComponent.vue b/resources/assets/vue/components/general/forms/SelectComponent.vue
index 394ec13b..1f902903 100644
--- a/resources/assets/vue/components/general/forms/SelectComponent.vue
+++ b/resources/assets/vue/components/general/forms/SelectComponent.vue
@@ -33,7 +33,11 @@
                 $(this.$el).val(value).trigger('change');
             },
             options: function(options){
-                $(this.$el).select2({ data: options });
+                $(this.$el).select2({
+                    data: options,
+                    minimumResultsForSearch: 6,
+                    theme: 'bootstrap',
+                    containerCssClass: 'form-control'});
                 this.value ? $(this.$el).val(this.value).trigger('change'):null;
             }
         },
diff --git a/resources/assets/vue/components/general/forms/SelectableHardCodedComponent.vue b/resources/assets/vue/components/general/forms/SelectableHardCodedComponent.vue
new file mode 100644
index 00000000..05a4e007
--- /dev/null
+++ b/resources/assets/vue/components/general/forms/SelectableHardCodedComponent.vue
@@ -0,0 +1,22 @@
+<template>
+    <select-component :options="selectableOptions" :value="value" @input="(val) => {$emit('input', val)}"></select-component>
+</template>
+<script>
+    export default {
+        props: {
+            value: {
+                required: false
+            },
+            section: {
+                type: String,
+                required: true
+            },
+            selectableOptions: {
+                type: Array,
+                required: true,
+                default: () => []
+            }
+        }
+    }
+</script>
+
diff --git a/resources/assets/vue/components/settings/elements/MilestoneSingleItemComponent.vue b/resources/assets/vue/components/settings/elements/MilestoneSingleItemComponent.vue
new file mode 100644
index 00000000..ab4f013e
--- /dev/null
+++ b/resources/assets/vue/components/settings/elements/MilestoneSingleItemComponent.vue
@@ -0,0 +1,89 @@
+<template>
+    <div class="row m-b-15 parentContainer">
+        <div class="col">
+            <div class="row align-items-center">
+                <div class="col">
+                    <div class="row">
+                        <div class="col-auto p-r-10">
+                            <div class="font-heading all-caps fs-8 muted">Name</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading all-caps fs-10">{{item.name}}</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="col">
+            <div class="row align-items-center">
+                <div class="col">
+                    <div class="row">
+                        <div class="col-auto p-r-10">
+                            <div class="font-heading all-caps fs-8 muted">Description</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading all-caps fs-10">{{item.description}}</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="col">
+            <div class="row align-items-center">
+                <div class="col">
+                    <div class="row">
+                        <div class="col-auto p-r-10">
+                            <div class="font-heading all-caps fs-8 muted">Number of rewards</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading all-caps fs-10">{{item.reward_ids.length}}</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="col-auto parentContainer">
+            <div class="row align-items-center">
+                <div class="col-auto no-padding">
+                    <button class="btn btn-xs btn-primary b-rad-none requestModal" data-type="createModal">
+                        <i class="fa fa-plus m-r-5"></i>
+                        Edit
+                    </button>
+                    <button class="btn btn-xs btn-outline-danger b-rad-none m-r-5 requestModal" data-type="deleteMilestone">
+                        <i class="fa fa-times"></i>
+                    </button>
+                    <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="deleteMilestone">
+                        <delete-milestone-form-component :data="item" :section="section" class="text-center"></delete-milestone-form-component>
+                    </modal-component>
+                </div>
+            </div>
+            <modal-form-component size="large" section="milestoneSection">
+                <template slot="form" slot-scope="{section}">
+                    <add-milestone-form-component :data="data" section="editMilestoneSection" :options-milestone-name="optionsMilestoneName" ></add-milestone-form-component>
+                </template>
+            </modal-form-component>
+        </div>
+    </div>
+</template>
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    export default {
+        props: {
+            section: {
+                default: 'milestoneSection'
+            },
+            optionsMilestoneName: {
+                type: Array,
+                required: true
+            },
+        },
+
+        mixins: [componentHandler]
+    }
+</script>
diff --git a/resources/assets/vue/components/settings/elements/RewardChecklistComponent.vue b/resources/assets/vue/components/settings/elements/RewardChecklistComponent.vue
new file mode 100644
index 00000000..453bdbe5
--- /dev/null
+++ b/resources/assets/vue/components/settings/elements/RewardChecklistComponent.vue
@@ -0,0 +1,34 @@
+<template>
+    <div class="m-l-10 m-t-25">
+        <loading-component style="height: 50px; top: 0;" color="success" v-show="$store.getters.isLoading(section)"></loading-component>
+        <div v-for="item in $store.getters.getSelectableList(section)" :key="item.id">
+            <input type="checkbox" :value="item.id" v-model="selectedItems">
+            {{ item.text }}
+        </div>
+    </div>
+</template>
+<script>
+
+    export default {
+        props: {
+            value: {
+                required: false
+            },
+            section: {
+                type: String,
+                required: true
+            },
+        },
+        computed: {
+            selectedItems: {
+                get() {
+                    return this.value; // Use the prop value as the getter
+                },
+                set(val) {
+                    this.$emit('input', val); // Emit the input event to update the prop value in the parent
+                },
+            },
+        }
+    }
+</script>
+
diff --git a/resources/assets/vue/components/settings/elements/RewardSingleItemComponent.vue b/resources/assets/vue/components/settings/elements/RewardSingleItemComponent.vue
new file mode 100644
index 00000000..a8510027
--- /dev/null
+++ b/resources/assets/vue/components/settings/elements/RewardSingleItemComponent.vue
@@ -0,0 +1,93 @@
+<template>
+    <div class="row m-b-15 parentContainer">
+        <div class="col">
+            <div class="row align-items-center">
+                <div class="col">
+                    <div class="row">
+                        <div class="col-auto p-r-10">
+                            <div class="font-heading all-caps fs-8 muted">Name</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading all-caps fs-10">{{item.name}}</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="col">
+            <div class="row align-items-center">
+                <div class="col">
+                    <div class="row">
+                        <div class="col-auto p-r-10">
+                            <div class="font-heading all-caps fs-8 muted">Description</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading all-caps fs-10">{{item.description}}</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="col">
+            <div class="row align-items-center">
+                <div class="col">
+                    <div class="row">
+                        <div class="col-auto p-r-10">
+                            <div class="font-heading all-caps fs-8 muted">No of Milestones</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col">
+                            <div class="font-heading all-caps fs-10">{{item.milestones.length}}</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="col-auto parentContainer">
+            <div class="row align-items-center">
+                <div class="col-auto no-padding">
+                    <button class="btn btn-xs btn-primary b-rad-none requestModal" data-type="createModal">
+                        <i class="fa fa-plus m-r-5"></i>
+                        Edit
+                    </button>
+                    <button class="btn btn-xs btn-outline-danger b-rad-none m-r-5 requestModal" data-type="deleteReward">
+                        <i class="fa fa-times"></i>
+                    </button>
+                    <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="deleteReward">
+                        <delete-reward-form-component :data="item" :section="section" class="text-center"></delete-reward-form-component>
+                    </modal-component>
+                </div>
+            </div>
+            <modal-form-component size="large" section="rewardsSection">
+                <template slot="form" slot-scope="{section}">
+                    <add-reward-form-component :data="data" :section="section" :options-is-active="optionsIsActive" :options-type="optionsType"></add-reward-form-component>
+                </template>
+            </modal-form-component>
+        </div>
+    </div>
+</template>
+
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    export default {
+        props: {
+            section: {
+                default: 'rewardsSection'
+            },
+            optionsIsActive: {
+                type: Array,
+                required: true
+            },
+            optionsType: {
+                type: Array,
+                required: true
+            }
+        },
+        mixins: [componentHandler]
+    }
+</script>
diff --git a/resources/assets/vue/components/settings/forms/AddMilestoneFormComponent.vue b/resources/assets/vue/components/settings/forms/AddMilestoneFormComponent.vue
new file mode 100644
index 00000000..461a447b
--- /dev/null
+++ b/resources/assets/vue/components/settings/forms/AddMilestoneFormComponent.vue
@@ -0,0 +1,112 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <loading-component style="height: 50px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading(section)"></loading-component>
+            <div class="row" v-show="!$store.getters.isLoading(section)">
+                <div class="col">
+                    <div class="row m-b-20">
+                        <div class="col">
+                            <h6 class="all-caps m-b-5 bold no-margin">{{ parameters.id ? 'Update Milestone' : 'Create Milestone' }}</h6>
+                        </div>
+                    </div>
+                    <div class="row m-b-5 animate__animated animate__fadeInUpBig animate__fast" v-if="error">
+                        <div class="col">
+                            <small class="bold fs-10 text-danger">{{error}}</small>
+                        </div>
+                    </div>
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <!-- Hidden Field -->
+                            <input type="hidden" class="form-control" v-if="parameters.id" v-model="parameters.id">
+                            <validation-wrapper-component selectable :validator="$v.parameters.name">
+                                <label>Name</label>
+                                <selectable-hard-coded-component section="milestoneNameOptions" :selectable-options="optionsMilestoneName" v-model="parameters.name"></selectable-hard-coded-component>
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <validation-wrapper-component :validator="$v.parameters.description">
+                                <label>Description</label>
+                                <input type="text" class="form-control" v-model="parameters.description">
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                    <div class="row m-b-15">
+                        <div class="col">
+                            <validation-wrapper-component selectable :validator="$v.parameters.reward_ids">
+                                <label>Rewards</label>
+                                <reward-checklist-component section="rewardListSection" v-model="parameters.reward_ids"></reward-checklist-component>
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col p-r-5">
+                            <div class="btn btn-sm btn-default bg-master-lightest btn-block b-rad-none" data-dismiss="modal">Cancel</div>
+                        </div>
+                        <div class="col p-l-5">
+                            <div class="btn btn-sm btn-success btn-block b-rad-none" @click="submitForm()">{{ parameters.id ? 'Update Milestone' : 'Create Milestone' }}</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import ModalFormHandler from '../../../general/mixins/modalFormHandler';
+    import { required } from "vuelidate/lib/validators";
+    export default {
+        props: {
+            optionsMilestoneName: {
+                type: Array,
+                required: true
+            }
+        },
+        data(){
+            return {
+                parameters: {
+                    id: 0,
+                    name: '',
+                    description: '',
+                    reward_ids: []
+                }
+            }
+        },
+        validations: {
+            parameters: {
+                id: {
+                    required
+                },
+                name: {
+                    required
+                },
+                description: {
+                    required
+                },
+                reward_ids: {
+                    required
+                }
+            }
+        },
+        methods: {
+            successHandler(){
+                this.closeModal();
+                this.formHandler();
+                this.reset();
+                this.$store.dispatch('reloadList', {'name': "rewardListSection"});
+            },
+            submitForm(){
+                this.submit(this.parameters.id ? this.route('api.milestone.update', this.parameters.id) : this.route('api.milestone.create'), this.data ? 'put' : 'post', this.section, true, true);
+            },
+            reset(){
+                this.parameters.id = 0;
+                this.parameters.name = '';
+                this.parameters.description= '';
+                this.parameters.reward_ids = [];
+                this.$v.$reset();
+            }
+        },
+        mixins: [ModalFormHandler]
+    }
+</script>
diff --git a/resources/assets/vue/components/settings/forms/AddRewardFormComponent.vue b/resources/assets/vue/components/settings/forms/AddRewardFormComponent.vue
new file mode 100644
index 00000000..b00be4b0
--- /dev/null
+++ b/resources/assets/vue/components/settings/forms/AddRewardFormComponent.vue
@@ -0,0 +1,158 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <loading-component style="height: 50px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading(section)"></loading-component>
+            <div class="row" v-show="!$store.getters.isLoading(section)">
+                <div class="col">
+                    <div class="row m-b-20">
+                        <div class="col">
+                            <h6 class="all-caps m-b-5 bold no-margin">{{ parameters.id ? 'Update Reward' : 'Create Reward' }}</h6>
+                        </div>
+                    </div>
+                    <div class="row m-b-5 animate__animated animate__fadeInUpBig animate__fast" v-if="error">
+                        <div class="col">
+                            <small class="bold fs-10 text-danger">{{error}}</small>
+                        </div>
+                    </div>
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <!-- Hidden Field -->
+                            <input type="hidden" class="form-control" v-if="parameters.id" v-model="parameters.id">
+                            <validation-wrapper-component :validator="$v.parameters.name">
+                                <label>Name</label>
+                                <input type="text" class="form-control" v-model="parameters.name">
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <validation-wrapper-component :validator="$v.parameters.description">
+                                <label>Description</label>
+                                <input type="text" class="form-control" v-model="parameters.description">
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <validation-wrapper-component selectable :validator="$v.parameters.is_active">
+                                <label>Is Active</label>
+                                <selectable-hard-coded-component section="rewardisActiveOptions" :selectable-options="optionsIsActive" v-model="parameters.is_active"></selectable-hard-coded-component >
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <validation-wrapper-component selectable :validator="$v.parameters.type">
+                                <label>Type</label>
+                                <selectable-hard-coded-component section="rewardTypeOptions" :selectable-options="optionsType" v-model="parameters.type"></selectable-hard-coded-component>
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <validation-wrapper-component :validator="$v.parameters.value">
+                                <label>Value</label>
+                                <input class="form-control" name="value" v-model.lazy="parameters.value">
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <validation-wrapper-component :validator="$v.parameters.order">
+                                <label>Order</label>
+                                <input class="form-control" name="value" v-model.lazy="parameters.order">
+                            </validation-wrapper-component>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col p-r-5">
+                            <div class="btn btn-sm btn-default bg-master-lightest btn-block b-rad-none" data-dismiss="modal">Cancel</div>
+                        </div>
+                        <div class="col p-l-5">
+                            <div class="btn btn-sm btn-success btn-block b-rad-none" @click="submit(route('api.reward.create'), 'post', section, true, false)">{{ parameters.id ? 'Update Reward' : 'Create Reward' }}</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import ModalFormHandler from '../../../general/mixins/modalFormHandler';
+    import { required } from "vuelidate/lib/validators";
+    export default {
+        props: {
+            section:{
+                type: String,
+                required: true
+            },
+            data: {
+                type: Object,
+                default: null
+            },
+            optionsIsActive: {
+                type: Array,
+                required: true
+            },
+            optionsType: {
+                type: Array,
+                required: true
+            }
+        },
+        data(){
+            return {
+                parameters: {
+                    id: 0,
+                    name: '',
+                    description: '',
+                    value: '',
+                    type: '',
+                    is_active: '',
+                    order: 9999
+                }
+            }
+        },
+        validations: {
+            parameters: {
+                id: {
+                    required
+                },
+                name: {
+                    required
+                },
+                description: {
+                    required
+                },
+                value: {
+                    required
+                },
+                type: {
+                    required
+                },
+                is_active: {
+                    required
+                },
+                order: {}
+            }
+        },
+        methods: {
+            successHandler(){
+                this.closeModal();
+                this.formHandler();
+                this.reset();
+                this.$store.dispatch('reloadList', {'name': "rewardListSection"});
+            },
+            reset(){
+                this.parameters.id = 0;
+                this.parameters.name = '';
+                this.parameters.description= '';
+                this.parameters.value= '';
+                this.parameters.type= '';
+                this.parameters.is_active= '';
+                this.parameters.order = 9999;
+                this.$v.$reset();
+            }
+        },
+        mixins: [ModalFormHandler]
+    }
+</script>
diff --git a/resources/assets/vue/components/settings/forms/DeleteMilestoneFormComponent.vue b/resources/assets/vue/components/settings/forms/DeleteMilestoneFormComponent.vue
new file mode 100644
index 00000000..63e0980c
--- /dev/null
+++ b/resources/assets/vue/components/settings/forms/DeleteMilestoneFormComponent.vue
@@ -0,0 +1,33 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <loading-component style="height: 300px; top: 0;" key="1" color="success" v-show="isLoading" ></loading-component>
+            <div class="row justify-content-center" v-show="!isLoading">
+                <div class="col">
+                    <div class="row m-b-20">
+                        <div class="col">
+                            <h3 class="all-caps">Are you Sure?</h3>
+                            <div class="fs-11">Are you sure you want to delete <b>{{item.name}}</b>?</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col p-r-5">
+                            <div class="btn btn-sm btn-success btn-block b-rad-none" data-dismiss="modal">Cancel</div>
+                        </div>
+                        <div class="col p-l-5">
+                            <div class="btn btn-sm btn-danger btn-block b-rad-none" @click="submit(route('api.milestone.delete', item.id), 'delete', section, true, true)">Delete</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    import ModalFormHandler from '../../../general/mixins/modalFormHandler';
+    export default {
+        mixins: [componentHandler, ModalFormHandler]
+
+    }
+</script>
diff --git a/resources/assets/vue/components/settings/forms/DeleteRewardFormComponent.vue b/resources/assets/vue/components/settings/forms/DeleteRewardFormComponent.vue
new file mode 100644
index 00000000..ecde176a
--- /dev/null
+++ b/resources/assets/vue/components/settings/forms/DeleteRewardFormComponent.vue
@@ -0,0 +1,33 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <loading-component style="height: 300px; top: 0;" key="1" color="success" v-show="isLoading" ></loading-component>
+            <div class="row justify-content-center" v-show="!isLoading">
+                <div class="col">
+                    <div class="row m-b-20">
+                        <div class="col">
+                            <h3 class="all-caps">Are you Sure?</h3>
+                            <div class="fs-11">Are you sure you want to delete <b>{{item.name}}</b>?</div>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col p-r-5">
+                            <div class="btn btn-sm btn-success btn-block b-rad-none" data-dismiss="modal">Cancel</div>
+                        </div>
+                        <div class="col p-l-5">
+                            <div class="btn btn-sm btn-danger btn-block b-rad-none" @click="submit(route('api.reward.delete', item.id), 'delete', section, true, true)">Delete</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import componentHandler from '../../../general/mixins/componentHandler';
+    import ModalFormHandler from '../../../general/mixins/modalFormHandler';
+    export default {
+        mixins: [componentHandler, ModalFormHandler]
+
+    }
+</script>
diff --git a/resources/assets/vue/components/settings/sections/MilestoneListComponent.vue b/resources/assets/vue/components/settings/sections/MilestoneListComponent.vue
new file mode 100644
index 00000000..def19717
--- /dev/null
+++ b/resources/assets/vue/components/settings/sections/MilestoneListComponent.vue
@@ -0,0 +1,79 @@
+
+<template>
+    <div class="row m-b-15 parentContainer">
+        <div class="col" v-if="this.$store.getters.getUserId">
+            <list-component :section="section" :endpoint="route('api.milestone.list')">
+                <template slot="list" slot-scope="{data}">
+                    <milestone-single-item-component :section="section" :data="data" :options-milestone-name="optionsMilestoneName"></milestone-single-item-component>
+                </template>
+            </list-component>
+        </div>
+    </div>
+</template>
+
+<script>
+    export default {
+        props: {
+            section: {
+                type: String,
+                required: true
+            },
+            optionsMilestoneName: {
+                type: Array,
+                required: true
+            },
+        },
+        data(){
+            return {
+                subSection: 'rewardListSection',
+                endpoint: route('api.reward.list'),
+                options: {'is_active': true},
+                valueColumn: "id",
+                labelColumn: ['name', 'milestones']
+            }
+        },
+        created(){
+            if(!this.$store.getters.isInQueue(this.subSection)){
+                this.$store.dispatch('updateListQueue', {name: this.subSection});
+            }
+        },
+        computed: {
+            pendingQueue () {
+                return this.$store.getters.isInCompleteQueue(this.subSection);
+            }
+        },
+        watch: {
+            pendingQueue(newVal, oldVal) {
+                if(newVal){
+                    this.preFetchDataForChildComponent();
+                }
+            }
+        },
+        methods: {
+            preFetchDataForChildComponent(){
+                this.$store.dispatch('toggleLoading', {name: this.subSection, status: true})
+                this.$store.dispatch('crudRequest', {endpoint: this.endpoint + '?filters=' + JSON.stringify(this.options), method: 'get'}).then(response => {
+                    let success = response.ok;
+                    response.json().then(response => {
+                        if(!success){return;}
+
+                        let vm = this;
+                        let mappedList = $.map(response.payload.data, function(value){
+                            let preservedValue = value;
+                            let result = {'id': !isNaN(value[vm.valueColumn]) ? parseInt(value[vm.valueColumn]) : value[vm.valueColumn],
+                                'text': vm.labelColumn.map(function(label){
+                                    return typeof preservedValue[label] === 'object' ? preservedValue[label].map(obj => obj.name) : preservedValue[label]
+                                }).join(': '),
+                            }
+                            return result;
+                        });
+                        this.$store.dispatch('updateListQueue', {name: 'original_'+this.subSection});
+                        this.$store.dispatch('completeList', {name: 'original_'+this.subSection, data: response.payload.data});
+                        this.$store.dispatch('completeList', {name: this.subSection, data: mappedList});
+                        this.$store.dispatch('toggleLoading', {name: this.subSection, status: false})
+                    });
+                })
+            },
+        },
+    }
+</script>
diff --git a/resources/views/pages/customers/reward.blade.php b/resources/views/pages/customers/reward.blade.php
new file mode 100644
index 00000000..6332f664
--- /dev/null
+++ b/resources/views/pages/customers/reward.blade.php
@@ -0,0 +1,27 @@
+@extends('layouts.base_portal')
+@section('inner_content')
+    <div class="row">
+        <div class="col-12 col-md-8 bg-white p-l-25 p-r-25 p-t-15 p-b-15">
+            <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading('rewardProfileSection')"></loading-component>
+            <div class="row p-b-5 m-b-20 b-b b-grey align-items-center parentContainer">
+                <div class="col">
+                    <div class="font-heading all-caps fs-10 hint-text">
+                        Vouchers
+                    </div>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col">
+                    <customer-rewards-admin-section-component id="{{$id}}" v-show="!$store.getters.isLoading('rewardProfileSection')"></customer-rewards-admin-section-component>
+                </div>
+            </div>
+        </div>
+        <div class="col-12 col-md-4 p-r-0">
+            <div class="row">
+                <div class="col">
+                    <add-voucher-section-component id="{{$id}}" section="addVoucherSection"></add-voucher-section-component>
+                </div>
+            </div>
+        </div>
+    </div>
+@endsection
diff --git a/resources/views/pages/rewards/customers.blade.php b/resources/views/pages/rewards/customers.blade.php
new file mode 100644
index 00000000..edbabb74
--- /dev/null
+++ b/resources/views/pages/rewards/customers.blade.php
@@ -0,0 +1,23 @@
+<div class="row d-none" :class="[{'d-flex': $store.getters.isCustomer}]" v-if="$store.getters.isCustomer">
+    <div class="col-12 col-md-8 bg-white p-l-25 p-r-25 p-t-15 p-b-15">
+		<div class="row p-b-5 m-b-20 b-b b-grey align-items-center parentContainer">
+            <div class="col">
+                <div class="font-heading all-caps fs-10 hint-text">
+                    Vouchers
+                </div>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col">
+                <customer-rewards-section-component section="customerMilestoneProgressSection"></customer-rewards-section-component>
+            </div>
+        </div>
+    </div>
+    <div class="col-12 col-md-4 p-r-0">
+        <div class="row">
+            <div class="col">
+                <add-voucher-section-component id="0" section="addVoucherSection"></add-voucher-section-component>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/resources/views/pages/rewards/index.blade.php b/resources/views/pages/rewards/index.blade.php
new file mode 100644
index 00000000..2a1daa8b
--- /dev/null
+++ b/resources/views/pages/rewards/index.blade.php
@@ -0,0 +1,4 @@
+@extends('layouts.base_portal')
+@section('inner_content')
+    @include('pages.rewards.customers')
+@endsection
diff --git a/resources/views/pages/settings.blade.php b/resources/views/pages/settings.blade.php
index 100fb380..f79ddcd2 100644
--- a/resources/views/pages/settings.blade.php
+++ b/resources/views/pages/settings.blade.php
@@ -5,6 +5,7 @@
         <div class="row">
             <div class="col-12 col-md-8">
                 <div class="row tabsContainer">
+                    <!-- tabs navigation -->
                     <div class="col-12 col-md-auto">
                         <div class="row">
                             <div class="col">
@@ -46,7 +47,7 @@
                                                             </div>
                                                             <div class="col">
                                                                 <div class="fs-12 m-t-5 all-caps m-b-5">Labels</div>
-                                                            </div> 
+                                                            </div>
                                                         </div>
                                                     </div>
                                                 </div>
@@ -69,7 +70,7 @@
                                                             </div>
                                                             <div class="col">
                                                                 <div class="fs-12 m-t-5 all-caps m-b-5">Seasonal Segment</div>
-                                                            </div> 
+                                                            </div>
                                                         </div>
                                                     </div>
                                                 </div>
@@ -208,7 +209,7 @@
                                                                 </div>
                                                                 <div class="col">
                                                                     <div class="fs-12 m-t-5 all-caps m-b-5">Custom Segments</div>
-                                                                </div> 
+                                                                </div>
                                                             </div>
                                                         </div>
                                                     </div>
@@ -216,7 +217,7 @@
                                             </div>
                                         </div>
                                     </div>
-                                    <div class="row">
+                                    <div class="row m-b-5">
                                         <div class="col">
                                             <div class="row">
                                                 <div class="col">
@@ -240,9 +241,57 @@
                                         </div>
                                     </div>
                                 </template>
+                                <div class="row m-b-5" v-if="$store.getters.isAdmin">
+                                    <div class="col">
+                                        <div class="row">
+                                            <div class="col">
+                                                <div class="row">
+                                                    <div class="col bg-master-light tabButton" tab-name="milestonesSegment">
+                                                        <div class="row align-items-center">
+                                                            <div class="col-auto  p-t-10 p-b-10 b-r b-grey">
+                                                                <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                                     width="35" height="35"
+                                                                     viewBox="0 0 172 172"
+                                                                     style=" fill:#000000;"><defs><linearGradient x1="86" y1="97.08594" x2="86" y2="105.31775" gradientUnits="userSpaceOnUse" id="color-1_43991_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="94.0625" y1="85.83338" x2="94.0625" y2="93.89588" gradientUnits="userSpaceOnUse" id="color-2_43991_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="77.9375" y1="85.83338" x2="77.9375" y2="93.89588" gradientUnits="userSpaceOnUse" id="color-3_43991_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="28.55469" x2="86" y2="143.10938" gradientUnits="userSpaceOnUse" id="color-4_43991_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><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><path d="M77.9375,96.75c0,4.45319 3.60931,8.0625 8.0625,8.0625c4.45319,0 8.0625,-3.60931 8.0625,-8.0625z" fill="url(#color-1_43991_gr1)"></path><path d="M94.0625,86c-2.2264,0 -4.03125,1.80485 -4.03125,4.03125c0,2.2264 1.80485,4.03125 4.03125,4.03125c2.2264,0 4.03125,-1.80485 4.03125,-4.03125c0,-2.2264 -1.80485,-4.03125 -4.03125,-4.03125z" fill="url(#color-2_43991_gr2)"></path><path d="M77.9375,86c-2.2264,0 -4.03125,1.80485 -4.03125,4.03125c0,2.2264 1.80485,4.03125 4.03125,4.03125c2.2264,0 4.03125,-1.80485 4.03125,-4.03125c0,-2.2264 -1.80485,-4.03125 -4.03125,-4.03125z" fill="url(#color-3_43991_gr3)"></path><path d="M147.8125,51.0625h-18.8125v-8.0625c0,-4.44512 -3.61738,-8.0625 -8.0625,-8.0625h-11.2445c-1.11263,-3.12019 -4.06888,-5.375 -7.568,-5.375h-32.25c-3.49912,0 -6.45538,2.25481 -7.568,5.375h-11.2445c-4.44512,0 -8.0625,3.61738 -8.0625,8.0625v8.0625h-18.8125c-4.44513,0 -8.0625,3.61738 -8.0625,8.0625v59.125c0,4.44512 3.61737,8.0625 8.0625,8.0625h18.8125v8.0625c0,4.44512 3.61738,8.0625 8.0625,8.0625h69.875c4.44512,0 8.0625,-3.61738 8.0625,-8.0625v-8.0625h18.8125c4.44512,0 8.0625,-3.61738 8.0625,-8.0625v-59.125c0,-4.44512 -3.61737,-8.0625 -8.0625,-8.0625zM147.8125,56.4375c1.4835,0 2.6875,1.20669 2.6875,2.6875v51.0625h-2.88637c-0.80625,-6.09525 -4.28119,-11.78469 -9.47612,-15.25425c0.99437,-1.87319 1.6125,-3.98019 1.6125,-6.24575v-5.375c0,-6.48763 -4.62519,-11.91638 -10.75,-13.16606v-13.70894zM134.375,88.6875c0,3.49912 -2.25213,6.45538 -5.375,7.568v-20.50831c3.12287,1.11262 5.375,4.06887 5.375,7.568zM134.6545,99.1365c3.913,2.48056 6.62469,6.84506 7.47125,11.051h-13.12575v-8.33394c2.12044,-0.43269 4.02319,-1.41094 5.6545,-2.71706zM67.1875,37.625c0,-1.48081 1.204,-2.6875 2.6875,-2.6875h32.25c1.4835,0 2.6875,1.20669 2.6875,2.6875v2.6875c0,1.48081 -1.204,2.6875 -2.6875,2.6875h-32.25c-1.4835,0 -2.6875,-1.20669 -2.6875,-2.6875zM51.0625,40.3125h10.75c0,4.44512 3.61737,8.0625 8.0625,8.0625h32.25c4.44512,0 8.0625,-3.61738 8.0625,-8.0625h10.75c1.4835,0 2.6875,1.20669 2.6875,2.6875v83.3125h-3.34056c-1.73881,-9.23963 -7.19444,-17.45531 -15.06344,-22.66906c1.44319,-2.88906 2.279,-6.13556 2.279,-9.58094v-10.75c0,-11.85456 -9.64544,-21.5 -21.5,-21.5c-11.85456,0 -21.5,9.64544 -21.5,21.5v10.75c0,3.44537 0.83581,6.69188 2.28169,9.58094c-7.869,5.21375 -13.32463,13.42675 -15.06344,22.66906h-3.34325v-83.3125c0,-1.48081 1.204,-2.6875 2.6875,-2.6875zM102.125,94.0625c0,8.89294 -7.23206,16.125 -16.125,16.125c-8.89294,0 -16.125,-7.23206 -16.125,-16.125v-10.75c0,-8.89294 7.23206,-16.125 16.125,-16.125c8.89294,0 16.125,7.23206 16.125,16.125zM86,115.5625c6.48494,0 12.29531,-2.89981 16.24056,-7.45513c6.39088,4.22744 10.93006,10.77956 12.59363,18.20513h-57.66837c1.66356,-7.42556 6.20275,-13.97769 12.59631,-18.20244c3.94256,4.55531 9.75294,7.45244 16.23787,7.45244zM43,96.2555c-3.12288,-1.11263 -5.375,-4.06888 -5.375,-7.568v-5.375c0,-3.49912 2.25212,-6.45538 5.375,-7.568zM37.32669,99.12306c1.634,1.31419 3.54481,2.29512 5.67331,2.7305v8.33394h-13.18487c0.78475,-4.57412 3.526,-8.63225 7.51156,-11.06444zM24.1875,56.4375h18.8125v13.70894c-6.12481,1.24969 -10.75,6.67575 -10.75,13.16606v5.375c0,2.26287 0.61544,4.36719 1.60981,6.24038c-5.21106,3.44806 -8.686,9.05688 -9.47613,15.25963h-2.88369v-51.0625c0,-1.48081 1.204,-2.6875 2.6875,-2.6875zM24.1875,120.9375c-1.4835,0 -2.6875,-1.20669 -2.6875,-2.6875v-2.6875h21.5v5.375zM120.9375,137.0625h-69.875c-1.4835,0 -2.6875,-1.20669 -2.6875,-2.6875v-2.6875h75.25v2.6875c0,1.48081 -1.204,2.6875 -2.6875,2.6875zM147.8125,120.9375h-18.8125v-5.375h21.5v2.6875c0,1.48081 -1.204,2.6875 -2.6875,2.6875z" fill="url(#color-4_43991_gr4)"></path></g></g></svg>
+                                                            </div>
+                                                            <div class="col">
+                                                                <div class="fs-12 m-t-5 all-caps m-b-5">Milestones</div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="row m-b-5" v-if="$store.getters.isAdmin">
+                                    <div class="col">
+                                        <div class="row">
+                                            <div class="col">
+                                                <div class="row">
+                                                    <div class="col bg-master-light tabButton" tab-name="rewardsSegment">
+                                                        <div class="row align-items-center">
+                                                            <div class="col-auto  p-t-10 p-b-10 b-r b-grey">
+                                                                <svg xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+                                                                     width="35" height="35"
+                                                                     viewBox="0 0 172 172"
+                                                                     style=" fill:#000000;"><defs><linearGradient x1="86" y1="97.08594" x2="86" y2="105.31775" gradientUnits="userSpaceOnUse" id="color-1_43991_gr1"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="94.0625" y1="85.83338" x2="94.0625" y2="93.89588" gradientUnits="userSpaceOnUse" id="color-2_43991_gr2"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="77.9375" y1="85.83338" x2="77.9375" y2="93.89588" gradientUnits="userSpaceOnUse" id="color-3_43991_gr3"><stop offset="0" stop-color="#4ec9ff"></stop><stop offset="1" stop-color="#2bffe6"></stop></linearGradient><linearGradient x1="86" y1="28.55469" x2="86" y2="143.10938" gradientUnits="userSpaceOnUse" id="color-4_43991_gr4"><stop offset="0" stop-color="#009add"></stop><stop offset="1" stop-color="#00baa4"></stop></linearGradient></defs><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><path d="M77.9375,96.75c0,4.45319 3.60931,8.0625 8.0625,8.0625c4.45319,0 8.0625,-3.60931 8.0625,-8.0625z" fill="url(#color-1_43991_gr1)"></path><path d="M94.0625,86c-2.2264,0 -4.03125,1.80485 -4.03125,4.03125c0,2.2264 1.80485,4.03125 4.03125,4.03125c2.2264,0 4.03125,-1.80485 4.03125,-4.03125c0,-2.2264 -1.80485,-4.03125 -4.03125,-4.03125z" fill="url(#color-2_43991_gr2)"></path><path d="M77.9375,86c-2.2264,0 -4.03125,1.80485 -4.03125,4.03125c0,2.2264 1.80485,4.03125 4.03125,4.03125c2.2264,0 4.03125,-1.80485 4.03125,-4.03125c0,-2.2264 -1.80485,-4.03125 -4.03125,-4.03125z" fill="url(#color-3_43991_gr3)"></path><path d="M147.8125,51.0625h-18.8125v-8.0625c0,-4.44512 -3.61738,-8.0625 -8.0625,-8.0625h-11.2445c-1.11263,-3.12019 -4.06888,-5.375 -7.568,-5.375h-32.25c-3.49912,0 -6.45538,2.25481 -7.568,5.375h-11.2445c-4.44512,0 -8.0625,3.61738 -8.0625,8.0625v8.0625h-18.8125c-4.44513,0 -8.0625,3.61738 -8.0625,8.0625v59.125c0,4.44512 3.61737,8.0625 8.0625,8.0625h18.8125v8.0625c0,4.44512 3.61738,8.0625 8.0625,8.0625h69.875c4.44512,0 8.0625,-3.61738 8.0625,-8.0625v-8.0625h18.8125c4.44512,0 8.0625,-3.61738 8.0625,-8.0625v-59.125c0,-4.44512 -3.61737,-8.0625 -8.0625,-8.0625zM147.8125,56.4375c1.4835,0 2.6875,1.20669 2.6875,2.6875v51.0625h-2.88637c-0.80625,-6.09525 -4.28119,-11.78469 -9.47612,-15.25425c0.99437,-1.87319 1.6125,-3.98019 1.6125,-6.24575v-5.375c0,-6.48763 -4.62519,-11.91638 -10.75,-13.16606v-13.70894zM134.375,88.6875c0,3.49912 -2.25213,6.45538 -5.375,7.568v-20.50831c3.12287,1.11262 5.375,4.06887 5.375,7.568zM134.6545,99.1365c3.913,2.48056 6.62469,6.84506 7.47125,11.051h-13.12575v-8.33394c2.12044,-0.43269 4.02319,-1.41094 5.6545,-2.71706zM67.1875,37.625c0,-1.48081 1.204,-2.6875 2.6875,-2.6875h32.25c1.4835,0 2.6875,1.20669 2.6875,2.6875v2.6875c0,1.48081 -1.204,2.6875 -2.6875,2.6875h-32.25c-1.4835,0 -2.6875,-1.20669 -2.6875,-2.6875zM51.0625,40.3125h10.75c0,4.44512 3.61737,8.0625 8.0625,8.0625h32.25c4.44512,0 8.0625,-3.61738 8.0625,-8.0625h10.75c1.4835,0 2.6875,1.20669 2.6875,2.6875v83.3125h-3.34056c-1.73881,-9.23963 -7.19444,-17.45531 -15.06344,-22.66906c1.44319,-2.88906 2.279,-6.13556 2.279,-9.58094v-10.75c0,-11.85456 -9.64544,-21.5 -21.5,-21.5c-11.85456,0 -21.5,9.64544 -21.5,21.5v10.75c0,3.44537 0.83581,6.69188 2.28169,9.58094c-7.869,5.21375 -13.32463,13.42675 -15.06344,22.66906h-3.34325v-83.3125c0,-1.48081 1.204,-2.6875 2.6875,-2.6875zM102.125,94.0625c0,8.89294 -7.23206,16.125 -16.125,16.125c-8.89294,0 -16.125,-7.23206 -16.125,-16.125v-10.75c0,-8.89294 7.23206,-16.125 16.125,-16.125c8.89294,0 16.125,7.23206 16.125,16.125zM86,115.5625c6.48494,0 12.29531,-2.89981 16.24056,-7.45513c6.39088,4.22744 10.93006,10.77956 12.59363,18.20513h-57.66837c1.66356,-7.42556 6.20275,-13.97769 12.59631,-18.20244c3.94256,4.55531 9.75294,7.45244 16.23787,7.45244zM43,96.2555c-3.12288,-1.11263 -5.375,-4.06888 -5.375,-7.568v-5.375c0,-3.49912 2.25212,-6.45538 5.375,-7.568zM37.32669,99.12306c1.634,1.31419 3.54481,2.29512 5.67331,2.7305v8.33394h-13.18487c0.78475,-4.57412 3.526,-8.63225 7.51156,-11.06444zM24.1875,56.4375h18.8125v13.70894c-6.12481,1.24969 -10.75,6.67575 -10.75,13.16606v5.375c0,2.26287 0.61544,4.36719 1.60981,6.24038c-5.21106,3.44806 -8.686,9.05688 -9.47613,15.25963h-2.88369v-51.0625c0,-1.48081 1.204,-2.6875 2.6875,-2.6875zM24.1875,120.9375c-1.4835,0 -2.6875,-1.20669 -2.6875,-2.6875v-2.6875h21.5v5.375zM120.9375,137.0625h-69.875c-1.4835,0 -2.6875,-1.20669 -2.6875,-2.6875v-2.6875h75.25v2.6875c0,1.48081 -1.204,2.6875 -2.6875,2.6875zM147.8125,120.9375h-18.8125v-5.375h21.5v2.6875c0,1.48081 -1.204,2.6875 -2.6875,2.6875z" fill="url(#color-4_43991_gr4)"></path></g></g></svg>
+                                                            </div>
+                                                            <div class="col">
+                                                                <div class="fs-12 m-t-5 all-caps m-b-5">Rewards</div>
+                                                            </div>
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
                             </div>
                         </div>
                     </div>
+
+                    <!-- tabs content -->
                     <div class="col bg-white p-l-25 p-r-25 p-t-15 p-b-15">
                         <div class="row tabsContainer tabContent" tab-name="profile">
                             <div class="col">
@@ -294,7 +343,7 @@
                                         <div class="row m-b-20">
                                             <div class="col">
                                                 <list-component section="labelSection" :endpoint="route('api.segment.list')" :options="{'type': 3}">
-                                                    <template slot="list" slot-scope="{data}">                                                         
+                                                    <template slot="list" slot-scope="{data}">
                                                         <segment-component section="labelSection" :data="data" :type="3"></segment-component>
                                                     </template>
                                                 </list-component>
@@ -608,6 +657,74 @@
                                 </div>
                             </div>
                         </template>
+                        <div class="row tabsContainer hide tabContent" tab-name="milestonesSegment" v-if="$store.getters.isAdmin">
+                            <div class="col">
+                                <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading('milestoneSection')"></loading-component>
+                                <div class="row" v-show="!$store.getters.isLoading('milestoneSection')">
+                                    <div class="col">
+                                        <div class="row p-b-5 m-b-20 b-b b-grey align-items-center parentContainer">
+                                            <div class="col">
+                                                <div class="font-heading all-caps fs-10 hint-text">
+                                                    Milestones
+                                                </div>
+                                            </div>
+                                            <div class="col-auto">
+                                                <button class="btn btn-xs btn-primary b-rad-none requestModal" data-type="createModal">
+                                                    <i class="fa fa-plus m-r-5"></i>
+                                                    Create Milestone
+                                                </button>
+                                                <modal-form-component section="milestoneSection">
+                                                    <template slot="form" slot-scope="{section}">
+                                                        <add-milestone-form-component :section="section" :options-milestone-name="{{ json_encode(\App\Classes\ValueObjects\Constants\MilestoneCreationOptions::OPTIONS_MILESTONE_NAME) }}"></add-milestone-form-component>
+                                                    </template>
+                                                </modal-form-component>
+                                            </div>
+                                        </div>
+                                        <div class="row m-b-20">
+                                            <div class="col">
+                                                <milestone-list-component section="milestoneSection" :options-milestone-name="{{ json_encode(\App\Classes\ValueObjects\Constants\MilestoneCreationOptions::OPTIONS_MILESTONE_NAME) }}"></milestone-list-component>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="row tabsContainer hide tabContent" tab-name="rewardsSegment" v-if="$store.getters.isAdmin">
+                            <div class="col">
+                                <loading-component style="height: 200px; top: 0;" key="1" color="success" v-show="$store.getters.isLoading('rewardsSection')"></loading-component>
+                                <div class="row" v-show="!$store.getters.isLoading('rewardsSection')">
+                                    <div class="col">
+                                        <div class="row p-b-5 m-b-20 b-b b-grey align-items-center parentContainer">
+                                            <div class="col">
+                                                <div class="font-heading all-caps fs-10 hint-text">
+                                                    Rewards
+                                                </div>
+                                            </div>
+                                            <div class="col-auto">
+                                                <button class="btn btn-xs btn-primary b-rad-none requestModal" data-type="createModal">
+                                                    <i class="fa fa-plus m-r-5"></i>
+                                                    Create Reward
+                                                </button>
+                                                <modal-form-component section="rewardsSection">
+                                                    <template slot="form" slot-scope="{section}">
+                                                        <add-reward-form-component :section="section" :options-is-active="{{ json_encode(\App\Classes\ValueObjects\Constants\RewardCreationOptions::OPTIONS_IS_ACTIVE) }}" :options-type="{{ json_encode(\App\Classes\ValueObjects\Constants\RewardCreationOptions::OPTIONS_TYPE) }}"></add-reward-form-component>
+                                                    </template>
+                                                </modal-form-component>
+                                            </div>
+                                        </div>
+                                        <div class="row m-b-20">
+                                            <div class="col">
+                                                <list-component section="rewardsSection" :endpoint="route('api.reward.list')">
+                                                    <template slot="list" slot-scope="{data}">
+                                                        <reward-single-item-component :options-is-active="{{ json_encode(\App\Classes\ValueObjects\Constants\RewardCreationOptions::OPTIONS_IS_ACTIVE) }}" :options-type="{{ json_encode(\App\Classes\ValueObjects\Constants\RewardCreationOptions::OPTIONS_TYPE) }}" section="rewardsSection" :data="data" ></reward-single-item-component>
+                                                    </template>
+                                                </list-component>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
                     </div>
                 </div>
             </div>
@@ -621,4 +738,4 @@
         </div>
     </div>
 </div>
-@endsection
\ No newline at end of file
+@endsection
diff --git a/resources/views/partials/header.blade.php b/resources/views/partials/header.blade.php
index e5031575..37bdcd9a 100644
--- a/resources/views/partials/header.blade.php
+++ b/resources/views/partials/header.blade.php
@@ -61,6 +61,9 @@
                                     <div v-if="$store.getters.isCustomer" class="col-auto p-r-20">
                                         <a href="{{route('banks')}}"><div class="text-white all-caps fs-12">Bank Accounts</div></a>
                                     </div>
+                                    <div v-if="$store.getters.isCustomer" class="col-auto p-r-20">
+                                        <a href="{{route('rewards')}}"><div class="text-white all-caps fs-12">Vouchers</div></a>
+                                    </div>
                                 </div>
                             </div>
                         </div>
@@ -114,4 +117,4 @@
             </div>
         </div>
     @endif
-</div>
\ No newline at end of file
+</div>
diff --git a/routes/api.php b/routes/api.php
index 2d820ed2..08673517 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -61,6 +61,10 @@ Route::group(['middleware' => 'api', 'prefix' => 'v1', 'as' => 'api.'], function
         
         require __DIR__ . '/accounting.php';
 
+        require __DIR__ . '/reward.php';
+
+        require __DIR__ . '/milestone.php';
+
 //        require __DIR__ . '/rate.php';
 //        require __DIR__ . '/receipt.php';
 
diff --git a/routes/milestone.php b/routes/milestone.php
new file mode 100644
index 00000000..4777e8c8
--- /dev/null
+++ b/routes/milestone.php
@@ -0,0 +1,11 @@
+<?php
+
+use Illuminate\Support\Facades\Route;
+
+Route::group(['prefix' => 'milestone', 'as' => 'milestone.', 'namespace' => 'Milestones'], function () {
+    Route::post('/create', 'CreateMilestoneController@create')->name('create');
+    Route::put('/update/{id}', 'UpdateMilestoneController@update')->name('update');
+    Route::get('/list', 'ListMilestonesController@list')->name('list');
+    Route::get('/user/{id}/progress/list', 'ListMilestoneProgressController@list')->name('progress.list');
+    Route::delete('/delete/{id}', 'DeleteMilestoneController@delete')->name('delete');
+});
diff --git a/routes/reward.php b/routes/reward.php
new file mode 100644
index 00000000..c58b19f5
--- /dev/null
+++ b/routes/reward.php
@@ -0,0 +1,11 @@
+<?php
+
+use Illuminate\Support\Facades\Route;
+
+Route::group(['prefix' => 'reward', 'as' => 'reward.', 'namespace' => 'Rewards'], function () {
+    Route::post('/create', 'CreateRewardController@create')->name('create');
+    Route::get('/list', 'ListRewardsController@list')->name('list');
+    Route::get('/list/details', 'ListRewardsDetailsController@list')->name('list.details');
+    Route::get('/list/details/{user_id}', 'ListRewardsDetailsController@list')->name('list.details.admin');
+    Route::delete('/delete/{id}', 'DeleteRewardController@delete')->name('delete');
+});
diff --git a/routes/voucher.php b/routes/voucher.php
index 5b0f3b29..17c980f5 100644
--- a/routes/voucher.php
+++ b/routes/voucher.php
@@ -4,5 +4,7 @@ use Illuminate\Support\Facades\Route;
 
 Route::group(['prefix' => 'voucher', 'as' => 'voucher.', 'namespace' => 'Vouchers'], function () {
     Route::post('fetch', 'ValidateVoucherController@validate')->name('validate');
-    Route::post('redeem', 'RedeemVoucherController@redeem')->name('redeem');
+    Route::post('create', 'CreateVoucherController@create')->name('create');
+    // Route::post('redeem', 'RedeemVoucherController@redeem')->name('redeem');
+    Route::get('/user/list', 'ListUserVouchersController@list')->name('user.list');
 });
diff --git a/routes/web.php b/routes/web.php
index 7042b498..609b06ea 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -638,23 +638,32 @@ Route::get('/open-purchase-order/{marking}/{from_date}/{to_date}', function ($ma
     foreach ($bookings as $booking) {
         $booking->status = ApprovalStatus::APPROVED;
         $booking->save();
-    
+
         $transaction = $booking->transactions()->whereIn('type', [TransactionType::INVOICE, TransactionType::SUPPLIER_DELIVER])->get();
         foreach ($transaction as $key => $row) {
             $deletesTransaction->execute($row);
         }
-    
+
         $document = $booking->documents()->whereIn('document_type', [DocumentType::PURCHASE_ORDER, DocumentType::INVOICE, DocumentType::DELIVER_ORDER, DocumentType::SUPPLIER_DELIVER_ORDER])->get();
         foreach ($document as $key => $row) {
             $deletesDocument->execute($row);
         }
-    
+
         $puchase_order = $booking->transactions()->where('type', TransactionType::PURCHASE_ORDER)->first();
         if($puchase_order) {
             $puchase_order->status = ApprovalStatus::PENDING_SUBMISSION;
             $puchase_order->save();
         }
-    
+
         dump('done - ' . $booking->marking);
     }
-});
\ No newline at end of file
+});
+
+Route::get('/vouchers', function () {
+    return view('pages.rewards.index');
+})->name('rewards');
+
+Route::get('/customer/vouchers/{marking}', function ($marking) {
+    $id = \App\Models\Company::where('reference', '=', $marking)->first()->employees->first()->id;
+    return view('pages.customers.reward', ['id' => $id]);
+})->name('customer.reward');