Update readme.md

.env.example

@@ -36,5 +36,3 @@ SANCTUM_STATEFUL_DOMAINS=crater.test
 SESSION_DOMAIN=crater.test
 
 TRUSTED_PROXIES="*"
-
-CRON_JOB_AUTH_TOKEN=""

.github/workflows/uffizzi-build.yml

@@ -1,162 +0,0 @@
-name: Build PR Image
-on:
-  pull_request:
-    types: [opened,synchronize,reopened,closed]
-
-jobs:
-
-  build-application:
-    name: Build and Push `application`
-    runs-on: ubuntu-latest
-    if: ${{ github.event_name != 'pull_request' || github.event.action != 'closed' }}
-    outputs:
-      tags: ${{ steps.meta.outputs.tags }}
-    steps:
-      - name: Checkout git repo
-        uses: actions/checkout@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2        
-      - name: Generate UUID image name
-        id: uuid
-        run: echo "UUID_TAG_APP=$(uuidgen)" >> $GITHUB_ENV
-      - name: Docker metadata
-        id: meta
-        uses: docker/metadata-action@v3
-        with:
-          images: registry.uffizzi.com/${{ env.UUID_TAG_APP }}
-          tags: type=raw,value=60d
-      - name: Build and Push Image to registry.uffizzi.com ephemeral registry
-        uses: docker/build-push-action@v2
-        with:
-          push: true
-          context: ./
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          file: ./uffizzi/Dockerfile
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-
-
-  build-nginx:
-    name: Build and Push `nginx`
-    runs-on: ubuntu-latest
-    if: ${{ github.event_name != 'pull_request' || github.event.action != 'closed' }}
-    outputs:
-      tags: ${{ steps.meta.outputs.tags }}
-    steps:
-      - name: Checkout git repo
-        uses: actions/checkout@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2        
-      - name: Generate UUID image name
-        id: uuid
-        run: echo "UUID_TAG_NGINX=$(uuidgen)" >> $GITHUB_ENV
-      - name: Docker metadata
-        id: meta
-        uses: docker/metadata-action@v3
-        with:
-          images: registry.uffizzi.com/${{ env.UUID_TAG_NGINX }}
-          tags: type=raw,value=60d
-      - name: Build and Push Image to Uffizzi ephemeral registry
-        uses: docker/build-push-action@v2
-        with:
-          push: true
-          context: ./
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          file: ./uffizzi/nginx/Dockerfile
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-
-
-  build-crond:
-    name: Build and Push `crond`
-    runs-on: ubuntu-latest
-    if: ${{ github.event_name != 'pull_request' || github.event.action != 'closed' }}
-    outputs:
-      tags: ${{ steps.meta.outputs.tags }}
-    steps:
-      - name: Checkout git repo
-        uses: actions/checkout@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2        
-      - name: Generate UUID image name
-        id: uuid
-        run: echo "UUID_TAG_CROND=$(uuidgen)" >> $GITHUB_ENV
-      - name: Docker metadata
-        id: meta
-        uses: docker/metadata-action@v3
-        with:
-          images: registry.uffizzi.com/${{ env.UUID_TAG_CROND }}
-          tags: type=raw,value=60d
-      - name: Build and Push Image to registry.uffizzi.com ephemeral registry
-        uses: docker/build-push-action@v2
-        with:
-          push: true
-          context: ./
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          file: ./uffizzi/crond/Dockerfile      
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-
-
-
-  render-compose-file:
-    name: Render Docker Compose File
-    # Pass output of this workflow to another triggered by `workflow_run` event.
-    runs-on: ubuntu-latest
-    outputs:
-      compose-file-cache-key: ${{ steps.hash.outputs.hash }}
-    needs: 
-      - build-application
-      - build-nginx
-      - build-crond
-    steps:
-      - name: Checkout git repo
-        uses: actions/checkout@v3
-      - name: Render Compose File
-        run: |
-          APP_IMAGE=$(echo ${{ needs.build-application.outputs.tags }})
-          export APP_IMAGE
-          NGINX_IMAGE=$(echo ${{ needs.build-nginx.outputs.tags }})
-          export NGINX_IMAGE
-          CROND_IMAGE=$(echo ${{ needs.build-crond.outputs.tags }})
-          export CROND_IMAGE
-          # Render simple template from environment variables.
-          envsubst < ./uffizzi/docker-compose.uffizzi.yml > docker-compose.rendered.yml
-          cat docker-compose.rendered.yml
-      - name: Upload Rendered Compose File as Artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: preview-spec
-          path: docker-compose.rendered.yml
-          retention-days: 2
-      - name: Serialize PR Event to File
-        run:  |
-          cat << EOF > event.json
-          ${{ toJSON(github.event) }} 
-          
-          EOF
-      - name: Upload PR Event as Artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: preview-spec
-          path: event.json
-          retention-days: 2
-
-  delete-preview:
-    name: Call for Preview Deletion
-    runs-on: ubuntu-latest
-    if: ${{ github.event.action == 'closed' }}
-    steps:
-      # If this PR is closing, we will not render a compose file nor pass it to the next workflow.
-      - name: Serialize PR Event to File
-        run: echo '${{ toJSON(github.event) }}' > event.json
-      - name: Upload PR Event as Artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: preview-spec
-          path: event.json
-          retention-days: 2
-

.github/workflows/uffizzi-preview.yml

@@ -1,84 +0,0 @@
-name: Deploy Uffizzi Preview
-
-on:
-  workflow_run:
-    workflows:
-      - "Build PR Image"
-    types:
-      - completed
-
-
-jobs:
-  cache-compose-file:
-    name: Cache Compose File
-    runs-on: ubuntu-latest
-    outputs:
-      compose-file-cache-key: ${{ env.COMPOSE_FILE_HASH }}
-      pr-number: ${{ env.PR_NUMBER }}
-    steps:
-      - name: 'Download artifacts'
-        # Fetch output (zip archive) from the workflow run that triggered this workflow.
-        uses: actions/github-script@v6
-        with:
-          script: |
-            let allArtifacts = await github.rest.actions.listWorkflowRunArtifacts({
-               owner: context.repo.owner,
-               repo: context.repo.repo,
-               run_id: context.payload.workflow_run.id,
-            });
-            let matchArtifact = allArtifacts.data.artifacts.filter((artifact) => {
-              return artifact.name == "preview-spec"
-            })[0];
-            let download = await github.rest.actions.downloadArtifact({
-               owner: context.repo.owner,
-               repo: context.repo.repo,
-               artifact_id: matchArtifact.id,
-               archive_format: 'zip',
-            });
-            let fs = require('fs');
-            fs.writeFileSync(`${process.env.GITHUB_WORKSPACE}/preview-spec.zip`, Buffer.from(download.data));
-      - name: 'Unzip artifact'
-        run: unzip preview-spec.zip
-      - name: Read Event into ENV
-        run: |
-          echo 'EVENT_JSON<<EOF' >> $GITHUB_ENV
-          cat event.json >> $GITHUB_ENV
-          echo 'EOF' >> $GITHUB_ENV
-      - name: Hash Rendered Compose File
-        id: hash
-        # If the previous workflow was triggered by a PR close event, we will not have a compose file artifact.
-        if: ${{ fromJSON(env.EVENT_JSON).action != 'closed' }}
-        run: echo "COMPOSE_FILE_HASH=$(md5sum docker-compose.rendered.yml | awk '{ print $1 }')" >> $GITHUB_ENV
-      - name: Cache Rendered Compose File
-        if: ${{ fromJSON(env.EVENT_JSON).action != 'closed' }}
-        uses: actions/cache@v3
-        with:
-          path: docker-compose.rendered.yml
-          key: ${{ env.COMPOSE_FILE_HASH }}
-
-      - name: Read PR Number From Event Object
-        id: pr
-        run: echo "PR_NUMBER=${{ fromJSON(env.EVENT_JSON).number }}" >> $GITHUB_ENV
-
-      - name: DEBUG - Print Job Outputs
-        if: ${{ runner.debug }}
-        run: |
-          echo "PR number: ${{ env.PR_NUMBER }}"
-          echo "Compose file hash: ${{ env.COMPOSE_FILE_HASH }}"
-          cat event.json
-  deploy-uffizzi-preview:
-    name: Use Remote Workflow to Preview on Uffizzi
-    needs:
-      - cache-compose-file
-    uses: UffizziCloud/preview-action/.github/workflows/reusable.yaml@v2.6.1
-    with:
-      # If this workflow was triggered by a PR close event, cache-key will be an empty string
-      # and this reusable workflow will delete the preview deployment.
-      compose-file-cache-key: ${{ needs.cache-compose-file.outputs.compose-file-cache-key }}
-      compose-file-cache-path: docker-compose.rendered.yml
-      server: https://app.uffizzi.com/
-      pr-number: ${{ needs.cache-compose-file.outputs.pr-number }}
-    permissions:
-      contents: read
-      pull-requests: write
-      id-token: write

.gitignore

@@ -1,4 +1,3 @@
-/Modules
 /node_modules
 /public/storage
 /public/hot
@@ -13,7 +12,3 @@ Homestead.yaml
 /.expo
 /.vscode
 /docker-compose/db/data/
-.gitkeep
-/public/docs
-/.scribe
-!storage/fonts/.gitkeep

Dockerfile

@@ -1,4 +1,4 @@
-FROM php:8.1-fpm
+FROM php:7.4-fpm
 
 # Arguments defined in docker-compose.yml
 ARG user

app/Console/Commands/CheckInvoiceStatus.php

@@ -40,13 +40,10 @@ class CheckInvoiceStatus extends Command
     public function handle()
     {
         $date = Carbon::now();
-        $invoices = Invoice::whereNotIn('status', [Invoice::STATUS_COMPLETED, Invoice::STATUS_DRAFT])
+        $invoices = Invoice::where('status', '<>', Invoice::STATUS_COMPLETED)->whereDate('due_date', '<', $date)->get();
-            ->where('overdue', false)
-            ->whereDate('due_date', '<', $date)
-            ->get();
 
         foreach ($invoices as $invoice) {
-            $invoice->overdue = true;
+            $invoice->status = Invoice::STATUS_OVERDUE;
             printf("Invoice %s is OVERDUE \n", $invoice->invoice_number);
             $invoice->save();
         }

app/Console/Commands/InstallModuleCommand.php

@@ -1,45 +0,0 @@
-<?php
-
-namespace Crater\Console\Commands;
-
-use Crater\Space\ModuleInstaller;
-use Illuminate\Console\Command;
-
-class InstallModuleCommand extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'install:module {module} {version}';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Install cloned module.';
-
-    /**
-     * Create a new command instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    /**
-     * Execute the console command.
-     *
-     * @return int
-     */
-    public function handle()
-    {
-        ModuleInstaller::complete($this->argument('module'), $this->argument('version'));
-
-        return Command::SUCCESS;
-    }
-}

app/Console/Kernel.php

@@ -2,7 +2,6 @@
 
 namespace Crater\Console;
 
-use Crater\Models\CompanySetting;
 use Crater\Models\RecurringInvoice;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
@@ -17,8 +16,7 @@ class Kernel extends ConsoleKernel
     protected $commands = [
         Commands\ResetApp::class,
         Commands\UpdateCommand::class,
-        Commands\CreateTemplateCommand::class,
+        Commands\CreateTemplateCommand::class
-        Commands\InstallModuleCommand::class,
     ];
 
     /**
@@ -38,11 +36,9 @@ class Kernel extends ConsoleKernel
 
             $recurringInvoices = RecurringInvoice::where('status', 'ACTIVE')->get();
             foreach ($recurringInvoices as $recurringInvoice) {
-                $timeZone = CompanySetting::getSetting('time_zone', $recurringInvoice->company_id);
-
                 $schedule->call(function () use ($recurringInvoice) {
                     $recurringInvoice->generateInvoice();
-                })->cron($recurringInvoice->frequency)->timezone($timeZone);
+                })->cron($recurringInvoice->frequency);
             }
         }
     }

app/Events/ModuleDisabledEvent.php

@@ -1,26 +0,0 @@
-<?php
-
-namespace Crater\Events;
-
-use Illuminate\Broadcasting\InteractsWithSockets;
-use Illuminate\Foundation\Events\Dispatchable;
-use Illuminate\Queue\SerializesModels;
-
-class ModuleDisabledEvent
-{
-    use Dispatchable;
-    use InteractsWithSockets;
-    use SerializesModels;
-
-    public $module;
-
-    /**
-     * Create a new event instance.
-     *
-     * @return void
-     */
-    public function __construct($module)
-    {
-        $this->module = $module;
-    }
-}

app/Events/ModuleEnabledEvent.php

@@ -1,26 +0,0 @@
-<?php
-
-namespace Crater\Events;
-
-use Illuminate\Broadcasting\InteractsWithSockets;
-use Illuminate\Foundation\Events\Dispatchable;
-use Illuminate\Queue\SerializesModels;
-
-class ModuleEnabledEvent
-{
-    use Dispatchable;
-    use InteractsWithSockets;
-    use SerializesModels;
-
-    public $module;
-
-    /**
-     * Create a new event instance.
-     *
-     * @return void
-     */
-    public function __construct($module)
-    {
-        $this->module = $module;
-    }
-}

app/Events/ModuleInstalledEvent.php

@@ -1,26 +0,0 @@
-<?php
-
-namespace Crater\Events;
-
-use Illuminate\Broadcasting\InteractsWithSockets;
-use Illuminate\Foundation\Events\Dispatchable;
-use Illuminate\Queue\SerializesModels;
-
-class ModuleInstalledEvent
-{
-    use Dispatchable;
-    use InteractsWithSockets;
-    use SerializesModels;
-
-    public $module;
-
-    /**
-     * Create a new event instance.
-     *
-     * @return void
-     */
-    public function __construct($module)
-    {
-        $this->module = $module;
-    }
-}

app/Http/Controllers/V1/Admin/Customer/CustomerStatsController.php

@@ -103,7 +103,6 @@ class CustomerStatsController extends Controller
         )
             ->whereCompany()
             ->whereCustomer($customer->id)
-            ->where('status', '<>', Invoice::STATUS_DRAFT)
             ->sum('total');
         $totalReceipts = Payment::whereBetween(
             'payment_date',

app/Http/Controllers/V1/Admin/Dashboard/DashboardController.php

@@ -12,7 +12,6 @@ use Crater\Models\Expense;
 use Crater\Models\Invoice;
 use Crater\Models\Payment;
 use Illuminate\Http\Request;
-use Silber\Bouncer\BouncerFacade;
 
 class DashboardController extends Controller
 {
@@ -104,7 +103,6 @@ class DashboardController extends Controller
             'invoice_date',
             [$startDate->format('Y-m-d'), $start->format('Y-m-d')]
         )
-            ->where('status', '<>', Invoice::STATUS_DRAFT)
             ->whereCompany()
             ->sum('base_total');
 
@@ -142,7 +140,6 @@ class DashboardController extends Controller
         $recent_due_invoices = Invoice::with('customer')
             ->whereCompany()
             ->where('base_due_amount', '>', 0)
-            ->where('status', '<>', Invoice::STATUS_DRAFT)
             ->take(5)
             ->latest()
             ->get();
@@ -154,8 +151,8 @@ class DashboardController extends Controller
             'total_invoice_count' => $total_invoice_count,
             'total_estimate_count' => $total_estimate_count,
 
-            'recent_due_invoices' => BouncerFacade::can('view-invoice', Invoice::class) ? $recent_due_invoices : [],
+            'recent_due_invoices' => $recent_due_invoices,
-            'recent_estimates' => BouncerFacade::can('view-estimate', Estimate::class) ? $recent_estimates : [],
+            'recent_estimates' => $recent_estimates,
 
             'chart_data' => $chart_data,
 

app/Http/Controllers/V1/Admin/Estimate/ConvertEstimateController.php

@@ -83,8 +83,6 @@ class ConvertEstimateController extends Controller
             'base_total' => $estimate->total * $exchange_rate,
             'base_tax' => $estimate->tax * $exchange_rate,
             'currency_id' => $estimate->currency_id,
-            'sales_tax_type' => $estimate->sales_tax_type,
-            'sales_tax_address_type' => $estimate->sales_tax_address_type,
         ]);
 
         $invoice->unique_hash = Hashids::connection(Invoice::class)->encode($invoice->id);

app/Http/Controllers/V1/Admin/Estimate/SendEstimatePreviewController.php

@@ -21,9 +21,6 @@ class SendEstimatePreviewController extends Controller
 
         $markdown = new Markdown(view(), config('mail.markdown'));
 
-        $data = $estimate->sendEstimateData($request->all());
+        return $markdown->render('emails.send.estimate', ['data' => $estimate->sendEstimateData($request->all())]);
-        $data['url'] = $estimate->estimatePdfUrl;
-
-        return $markdown->render('emails.send.estimate', ['data' => $data]);
     }
 }

app/Http/Controllers/V1/Admin/Expense/ExpensesController.php

@@ -39,7 +39,7 @@ class ExpensesController extends Controller
     /**
      * Store a newly created resource in storage.
      *
-     * @param  \Crater\Http\Requests\ExpenseRequest $request
+     * @param  \Illuminate\Http\Request $request
      * @return \Illuminate\Http\JsonResponse
      */
     public function store(ExpenseRequest $request)
@@ -67,7 +67,7 @@ class ExpensesController extends Controller
     /**
      * Update the specified resource in storage.
      *
-     * @param  \Crater\Http\Requests\ExpenseRequest $request
+     * @param  \Illuminate\Http\Request $request
      * @param  \Crater\Models\Expense $expense
      * @return \Illuminate\Http\JsonResponse
      */

app/Http/Controllers/V1/Admin/Expense/UploadReceiptController.php

@@ -3,19 +3,19 @@
 namespace Crater\Http\Controllers\V1\Admin\Expense;
 
 use Crater\Http\Controllers\Controller;
-use Crater\Http\Requests\UploadExpenseReceiptRequest;
 use Crater\Models\Expense;
+use Illuminate\Http\Request;
 
 class UploadReceiptController extends Controller
 {
     /**
      * Upload the expense receipts to storage.
      *
-     * @param  \Crater\Http\Requests\ExpenseRequest $request
+     * @param  \Illuminate\Http\Request $request
      * @param  Expense $expense
      * @return \Illuminate\Http\JsonResponse
      */
-    public function __invoke(UploadExpenseReceiptRequest $request, Expense $expense)
+    public function __invoke(Request $request, Expense $expense)
     {
         $this->authorize('update', $expense);
 

app/Http/Controllers/V1/Admin/General/BootstrapController.php

@@ -8,8 +8,6 @@ use Crater\Http\Resources\UserResource;
 use Crater\Models\Company;
 use Crater\Models\CompanySetting;
 use Crater\Models\Currency;
-use Crater\Models\Module;
-use Crater\Models\Setting;
 use Crater\Traits\GeneratesMenuTrait;
 use Illuminate\Http\Request;
 use Silber\Bouncer\BouncerFacade;
@@ -49,17 +47,6 @@ class BootstrapController extends Controller
 
         BouncerFacade::refreshFor($current_user);
 
-        $global_settings = Setting::getSettings([
-            'api_token',
-            'admin_portal_theme',
-            'admin_portal_logo',
-            'login_page_logo',
-            'login_page_heading',
-            'login_page_description',
-            'admin_page_title',
-            'copyright_text'
-        ]);
-
         return response()->json([
             'current_user' => new UserResource($current_user),
             'current_user_settings' => $current_user_settings,
@@ -69,10 +56,8 @@ class BootstrapController extends Controller
             'current_company_settings' => $current_company_settings,
             'current_company_currency' => $current_company_currency,
             'config' => config('crater'),
-            'global_settings' => $global_settings,
             'main_menu' => $main_menu,
             'setting_menu' => $setting_menu,
-            'modules' => Module::where('enabled', true)->pluck('name'),
         ]);
     }
 }

app/Http/Controllers/V1/Admin/General/SearchController.php

@@ -20,7 +20,6 @@ class SearchController extends Controller
         $user = $request->user();
 
         $customers = Customer::applyFilters($request->only(['search']))
-            ->whereCompany()
             ->latest()
             ->paginate(10);
 

app/Http/Controllers/V1/Admin/Invoice/CloneInvoiceController.php

@@ -76,8 +76,6 @@ class CloneInvoiceController extends Controller
             'base_tax' => $invoice->tax * $exchange_rate,
             'base_due_amount' => $invoice->total * $exchange_rate,
             'currency_id' => $invoice->currency_id,
-            'sales_tax_type' => $invoice->sales_tax_type,
-            'sales_tax_address_type' => $invoice->sales_tax_address_type,
         ]);
 
         $newInvoice->unique_hash = Hashids::connection(Invoice::class)->encode($newInvoice->id);

app/Http/Controllers/V1/Admin/Invoice/InvoicesController.php

@@ -24,7 +24,6 @@ class InvoicesController extends Controller
         $limit = $request->has('limit') ? $request->limit : 10;
 
         $invoices = Invoice::whereCompany()
-            ->whereTabFilters($request->tab_status)
             ->join('customers', 'customers.id', '=', 'invoices.customer_id')
             ->applyFilters($request->all())
             ->select('invoices.*', 'customers.name')
@@ -103,7 +102,7 @@ class InvoicesController extends Controller
     {
         $this->authorize('delete multiple invoices');
 
-        Invoice::deleteInvoices($request->ids);
+        Invoice::destroy($request->ids);
 
         return response()->json([
             'success' => true,

app/Http/Controllers/V1/Admin/Invoice/SendInvoicePreviewController.php

@@ -21,9 +21,6 @@ class SendInvoicePreviewController extends Controller
 
         $markdown = new Markdown(view(), config('mail.markdown'));
 
-        $data = $invoice->sendInvoiceData($request->all());
+        return $markdown->render('emails.send.invoice', ['data' => $invoice->sendInvoiceData($request->all())]);
-        $data['url'] = $invoice->invoicePdfUrl;
-
-        return $markdown->render('emails.send.invoice', ['data' => $data]);
     }
 }

app/Http/Controllers/V1/Admin/Modules/ApiTokenController.php

@@ -1,25 +0,0 @@
-<?php
-
-namespace Crater\Http\Controllers\V1\Admin\Modules;
-
-use Crater\Http\Controllers\Controller;
-use Crater\Space\ModuleInstaller;
-use Illuminate\Http\Request;
-
-class ApiTokenController extends Controller
-{
-    /**
-     * Handle the incoming request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function __invoke(Request $request)
-    {
-        $this->authorize('manage modules');
-
-        $response = ModuleInstaller::checkToken($request->api_token);
-
-        return $response;
-    }
-}

app/Http/Controllers/V1/Admin/Modules/CompleteModuleInstallationController.php

@@ -1,27 +0,0 @@
-<?php
-
-namespace Crater\Http\Controllers\V1\Admin\Modules;
-
-use Crater\Http\Controllers\Controller;
-use Crater\Space\ModuleInstaller;
-use Illuminate\Http\Request;
-
-class CompleteModuleInstallationController extends Controller
-{
-    /**
-     * Handle the incoming request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function __invoke(Request $request)
-    {
-        $this->authorize('manage modules');
-
-        $response = ModuleInstaller::complete($request->module, $request->version);
-
-        return response()->json([
-            'success' => $response
-        ]);
-    }
-}

app/Http/Controllers/V1/Admin/Modules/CopyModuleController.php

@@ -1,27 +0,0 @@
-<?php
-
-namespace Crater\Http\Controllers\V1\Admin\Modules;
-
-use Crater\Http\Controllers\Controller;
-use Crater\Space\ModuleInstaller;
-use Illuminate\Http\Request;
-
-class CopyModuleController extends Controller
-{
-    /**
-     * Handle the incoming request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function __invoke(Request $request)
-    {
-        $this->authorize('manage modules');
-
-        $response = ModuleInstaller::copyFiles($request->module, $request->path);
-
-        return response()->json([
-            'success' => $response
-        ]);
-    }
-}

app/Http/Controllers/V1/Admin/Modules/DisableModuleController.php

@@ -1,32 +0,0 @@
-<?php
-
-namespace Crater\Http\Controllers\V1\Admin\Modules;
-
-use Crater\Events\ModuleDisabledEvent;
-use Crater\Http\Controllers\Controller;
-use Crater\Models\Module as ModelsModule;
-use Illuminate\Http\Request;
-use Nwidart\Modules\Facades\Module;
-
-class DisableModuleController extends Controller
-{
-    /**
-     * Handle the incoming request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function __invoke(Request $request, string $module)
-    {
-        $this->authorize('manage modules');
-
-        $module = ModelsModule::where('name', $module)->first();
-        $module->update(['enabled' => false]);
-        $installedModule = Module::find($module->name);
-        $installedModule->disable();
-
-        ModuleDisabledEvent::dispatch($module);
-
-        return response()->json(['success' => true]);
-    }
-}

app/Http/Controllers/V1/Admin/Modules/DownloadModuleController.php

@@ -1,25 +0,0 @@
-<?php
-
-namespace Crater\Http\Controllers\V1\Admin\Modules;
-
-use Crater\Http\Controllers\Controller;
-use Crater\Space\ModuleInstaller;
-use Illuminate\Http\Request;
-
-class DownloadModuleController extends Controller
-{
-    /**
-     * Handle the incoming request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function __invoke(Request $request)
-    {
-        $this->authorize('manage modules');
-
-        $response = ModuleInstaller::download($request->module, $request->version);
-
-        return response()->json($response);
-    }
-}

app/Http/Controllers/V1/Admin/Modules/EnableModuleController.php

@@ -1,32 +0,0 @@
-<?php
-
-namespace Crater\Http\Controllers\V1\Admin\Modules;
-
-use Crater\Events\ModuleEnabledEvent;
-use Crater\Http\Controllers\Controller;
-use Crater\Models\Module as ModelsModule;
-use Illuminate\Http\Request;
-use Nwidart\Modules\Facades\Module;
-
-class EnableModuleController extends Controller
-{
-    /**
-     * Handle the incoming request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function __invoke(Request $request, string $module)
-    {
-        $this->authorize('manage modules');
-
-        $module = ModelsModule::where('name', $module)->first();
-        $module->update(['enabled' => true]);
-        $installedModule = Module::find($module->name);
-        $installedModule->enable();
-
-        ModuleEnabledEvent::dispatch($module);
-
-        return response()->json(['success' => true]);
-    }
-}

app/Http/Controllers/V1/Admin/Modules/ModuleController.php

@@ -1,33 +0,0 @@
-<?php
-
-namespace Crater\Http\Controllers\V1\Admin\Modules;
-
-use Crater\Http\Controllers\Controller;
-use Crater\Http\Resources\ModuleResource;
-use Crater\Space\ModuleInstaller;
-use Illuminate\Http\Request;
-
-class ModuleController extends Controller
-{
-    /**
-     * Handle the incoming request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function __invoke(Request $request, string $module)
-    {
-        $this->authorize('manage modules');
-
-        $response = ModuleInstaller::getModule($module);
-
-        if (! $response->success) {
-            return response()->json($response);
-        }
-
-        return (new ModuleResource($response->module))
-            ->additional(['meta' => [
-                'modules' => ModuleResource::collection(collect($response->modules))
-            ]]);
-    }
-}

app/Http/Controllers/V1/Admin/Modules/ModulesController.php

@@ -1,25 +0,0 @@
-<?php
-
-namespace Crater\Http\Controllers\V1\Admin\Modules;
-
-use Crater\Http\Controllers\Controller;
-use Crater\Space\ModuleInstaller;
-use Illuminate\Http\Request;
-
-class ModulesController extends Controller
-{
-    /**
-     * Handle the incoming request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function __invoke(Request $request)
-    {
-        $this->authorize('manage modules');
-
-        $response = ModuleInstaller::getModules();
-
-        return $response;
-    }
-}

app/Http/Controllers/V1/Admin/Modules/UnzipModuleController.php

@@ -1,28 +0,0 @@
-<?php
-
-namespace Crater\Http\Controllers\V1\Admin\Modules;
-
-use Crater\Http\Controllers\Controller;
-use Crater\Http\Requests\UnzipUpdateRequest;
-use Crater\Space\ModuleInstaller;
-
-class UnzipModuleController extends Controller
-{
-    /**
-     * Handle the incoming request.
-     *
-     * @param  \Crater\Http\Requests\UnzipUpdateRequest  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function __invoke(UnzipUpdateRequest $request)
-    {
-        $this->authorize('manage modules');
-
-        $path = ModuleInstaller::unzip($request->module, $request->path);
-
-        return response()->json([
-            'success' => true,
-            'path' => $path
-        ]);
-    }
-}

app/Http/Controllers/V1/Admin/Modules/UploadModuleController.php

@@ -1,25 +0,0 @@
-<?php
-
-namespace Crater\Http\Controllers\V1\Admin\Modules;
-
-use Crater\Http\Controllers\Controller;
-use Crater\Http\Requests\UploadModuleRequest;
-use Crater\Space\ModuleInstaller;
-
-class UploadModuleController extends Controller
-{
-    /**
-     * Handle the incoming request.
-     *
-     * @param  \Crater\Http\Requests\UploadModuleRequest  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function __invoke(UploadModuleRequest $request)
-    {
-        $this->authorize('manage modules');
-
-        $response = ModuleInstaller::upload($request);
-
-        return response()->json($response);
-    }
-}

app/Http/Controllers/V1/Admin/Payment/PaymentMethodsController.php

@@ -22,7 +22,6 @@ class PaymentMethodsController extends Controller
         $limit = $request->has('limit') ? $request->limit : 5;
 
         $paymentMethods = PaymentMethod::applyFilters($request->all())
-            ->where('type', PaymentMethod::TYPE_GENERAL)
             ->whereCompany()
             ->latest()
             ->paginateData($limit);
@@ -69,7 +68,7 @@ class PaymentMethodsController extends Controller
     {
         $this->authorize('update', $paymentMethod);
 
-        $paymentMethod->update($request->getPaymentMethodPayload());
+        $paymentMethod->update($request->validated());
 
         return new PaymentMethodResource($paymentMethod);
     }
@@ -84,12 +83,10 @@ class PaymentMethodsController extends Controller
     {
         $this->authorize('delete', $paymentMethod);
 
-        if ($paymentMethod->payments()->exists()) {
+        $payments = $paymentMethod->payments;
-            return respondJson('payments_attached', 'Payments Attached.');
-        }
 
-        if ($paymentMethod->expenses()->exists()) {
+        if ($payments->count() > 0) {
-            return respondJson('expenses_attached', 'Expenses Attached.');
+            return respondJson('payments_attached', 'Payments Attached.');
         }
 
         $paymentMethod->delete();

app/Http/Controllers/V1/Admin/Payment/SendPaymentPreviewController.php

@@ -21,9 +21,6 @@ class SendPaymentPreviewController extends Controller
 
         $markdown = new Markdown(view(), config('mail.markdown'));
 
-        $data = $payment->sendPaymentData($request->all());
+        return $markdown->render('emails.send.payment', ['data' => $payment->sendPaymentData($request->all())]);
-        $data['url'] = $payment->paymentPdfUrl;
-
-        return $markdown->render('emails.send.payment', ['data' => $data]);
     }
 }

app/Http/Controllers/V1/Admin/Report/CustomerSalesReportController.php

@@ -2,25 +2,24 @@
 
 namespace Crater\Http\Controllers\V1\Admin\Report;
 
-use PDF;
 use Carbon\Carbon;
+use Crater\Http\Controllers\Controller;
 use Crater\Models\Company;
-use Crater\Models\Currency;
+use Crater\Models\CompanySetting;
 use Crater\Models\Customer;
 use Illuminate\Http\Request;
-use Crater\Models\CompanySetting;
 use Illuminate\Support\Facades\App;
-use Crater\Http\Controllers\Controller;
+use PDF;
 
 class CustomerSalesReportController extends Controller
 {
     /**
-     * Handle the incoming request.
+    * Handle the incoming request.
-     *
+    *
-     * @param  \Illuminate\Http\Request  $request
+    * @param  \Illuminate\Http\Request  $request
-     * @param  string  $hash
+    * @param  string  $hash
-     * @return \Illuminate\Http\JsonResponse
+    * @return \Illuminate\Http\JsonResponse
-     */
+    */
     public function __invoke(Request $request, $hash)
     {
         $company = Company::where('unique_hash', $hash)->first();
@@ -57,7 +56,6 @@ class CustomerSalesReportController extends Controller
         $dateFormat = CompanySetting::getSetting('carbon_date_format', $company->id);
         $from_date = Carbon::createFromFormat('Y-m-d', $request->from_date)->format($dateFormat);
         $to_date = Carbon::createFromFormat('Y-m-d', $request->to_date)->format($dateFormat);
-        $currency = Currency::findOrFail(CompanySetting::getSetting('currency', $company->id));
 
         $colors = [
             'primary_text_color',
@@ -82,7 +80,6 @@ class CustomerSalesReportController extends Controller
             'company' => $company,
             'from_date' => $from_date,
             'to_date' => $to_date,
-            'currency' => $currency,
         ]);
 
         $pdf = PDF::loadView('app.pdf.reports.sales-customers');

app/Http/Controllers/V1/Admin/Report/ExpensesReportController.php

@@ -2,25 +2,24 @@
 
 namespace Crater\Http\Controllers\V1\Admin\Report;
 
-use PDF;
 use Carbon\Carbon;
-use Crater\Models\Company;
-use Crater\Models\Expense;
-use Crater\Models\Currency;
-use Illuminate\Http\Request;
-use Crater\Models\CompanySetting;
-use Illuminate\Support\Facades\App;
 use Crater\Http\Controllers\Controller;
+use Crater\Models\Company;
+use Crater\Models\CompanySetting;
+use Crater\Models\Expense;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\App;
+use PDF;
 
 class ExpensesReportController extends Controller
 {
     /**
-     * Handle the incoming request.
+    * Handle the incoming request.
-     *
+    *
-     * @param  \Illuminate\Http\Request  $request
+    * @param  \Illuminate\Http\Request  $request
-     * @param  string  $hash
+    * @param  string  $hash
-     * @return \Illuminate\Http\JsonResponse
+    * @return \Illuminate\Http\JsonResponse
-     */
+    */
     public function __invoke(Request $request, $hash)
     {
         $company = Company::where('unique_hash', $hash)->first();
@@ -44,7 +43,6 @@ class ExpensesReportController extends Controller
         $dateFormat = CompanySetting::getSetting('carbon_date_format', $company->id);
         $from_date = Carbon::createFromFormat('Y-m-d', $request->from_date)->format($dateFormat);
         $to_date = Carbon::createFromFormat('Y-m-d', $request->to_date)->format($dateFormat);
-        $currency = Currency::findOrFail(CompanySetting::getSetting('currency', $company->id));
 
         $colors = [
             'primary_text_color',
@@ -68,7 +66,6 @@ class ExpensesReportController extends Controller
             'company' => $company,
             'from_date' => $from_date,
             'to_date' => $to_date,
-            'currency' => $currency,
         ]);
         $pdf = PDF::loadView('app.pdf.reports.expenses');
 

app/Http/Controllers/V1/Admin/Report/ItemSalesReportController.php

@@ -2,25 +2,24 @@
 
 namespace Crater\Http\Controllers\V1\Admin\Report;
 
-use PDF;
 use Carbon\Carbon;
-use Crater\Models\Company;
-use Crater\Models\Currency;
-use Illuminate\Http\Request;
-use Crater\Models\InvoiceItem;
-use Crater\Models\CompanySetting;
-use Illuminate\Support\Facades\App;
 use Crater\Http\Controllers\Controller;
+use Crater\Models\Company;
+use Crater\Models\CompanySetting;
+use Crater\Models\InvoiceItem;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\App;
+use PDF;
 
 class ItemSalesReportController extends Controller
 {
     /**
-     * Handle the incoming request.
+    * Handle the incoming request.
-     *
+    *
-     * @param  \Illuminate\Http\Request  $request
+    * @param  \Illuminate\Http\Request  $request
-     * @param  string  $hash
+    * @param  string  $hash
-     * @return \Illuminate\Http\JsonResponse
+    * @return \Illuminate\Http\JsonResponse
-     */
+    */
     public function __invoke(Request $request, $hash)
     {
         $company = Company::where('unique_hash', $hash)->first();
@@ -44,7 +43,6 @@ class ItemSalesReportController extends Controller
         $dateFormat = CompanySetting::getSetting('carbon_date_format', $company->id);
         $from_date = Carbon::createFromFormat('Y-m-d', $request->from_date)->format($dateFormat);
         $to_date = Carbon::createFromFormat('Y-m-d', $request->to_date)->format($dateFormat);
-        $currency = Currency::findOrFail(CompanySetting::getSetting('currency', $company->id));
 
         $colors = [
             'primary_text_color',
@@ -68,7 +66,6 @@ class ItemSalesReportController extends Controller
             'company' => $company,
             'from_date' => $from_date,
             'to_date' => $to_date,
-            'currency' => $currency,
         ]);
         $pdf = PDF::loadView('app.pdf.reports.sales-items');
 

app/Http/Controllers/V1/Admin/Report/ProfitLossReportController.php

@@ -2,26 +2,25 @@
 
 namespace Crater\Http\Controllers\V1\Admin\Report;
 
-use PDF;
 use Carbon\Carbon;
+use Crater\Http\Controllers\Controller;
 use Crater\Models\Company;
+use Crater\Models\CompanySetting;
 use Crater\Models\Expense;
 use Crater\Models\Payment;
-use Crater\Models\Currency;
 use Illuminate\Http\Request;
-use Crater\Models\CompanySetting;
 use Illuminate\Support\Facades\App;
-use Crater\Http\Controllers\Controller;
+use PDF;
 
 class ProfitLossReportController extends Controller
 {
     /**
-     * Handle the incoming request.
+    * Handle the incoming request.
-     *
+    *
-     * @param  \Illuminate\Http\Request  $request
+    * @param  \Illuminate\Http\Request  $request
-     * @param  string  $hash
+    * @param  string  $hash
-     * @return \Illuminate\Http\JsonResponse
+    * @return \Illuminate\Http\JsonResponse
-     */
+    */
     public function __invoke(Request $request, $hash)
     {
         $company = Company::where('unique_hash', $hash)->first();
@@ -50,8 +49,6 @@ class ProfitLossReportController extends Controller
         $dateFormat = CompanySetting::getSetting('carbon_date_format', $company->id);
         $from_date = Carbon::createFromFormat('Y-m-d', $request->from_date)->format($dateFormat);
         $to_date = Carbon::createFromFormat('Y-m-d', $request->to_date)->format($dateFormat);
-        $currency = Currency::findOrFail(CompanySetting::getSetting('currency', $company->id));
-
 
         $colors = [
             'primary_text_color',
@@ -77,7 +74,6 @@ class ProfitLossReportController extends Controller
             'company' => $company,
             'from_date' => $from_date,
             'to_date' => $to_date,
-            'currency' => $currency,
         ]);
         $pdf = PDF::loadView('app.pdf.reports.profit-loss');
 

app/Http/Controllers/V1/Admin/Report/TaxSummaryReportController.php

@@ -2,25 +2,24 @@
 
 namespace Crater\Http\Controllers\V1\Admin\Report;
 
-use PDF;
 use Carbon\Carbon;
-use Crater\Models\Tax;
-use Crater\Models\Company;
-use Crater\Models\Currency;
-use Illuminate\Http\Request;
-use Crater\Models\CompanySetting;
-use Illuminate\Support\Facades\App;
 use Crater\Http\Controllers\Controller;
+use Crater\Models\Company;
+use Crater\Models\CompanySetting;
+use Crater\Models\Tax;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\App;
+use PDF;
 
 class TaxSummaryReportController extends Controller
 {
     /**
-     * Handle the incoming request.
+    * Handle the incoming request.
-     *
+    *
-     * @param  \Illuminate\Http\Request  $request
+    * @param  \Illuminate\Http\Request  $request
-     * @param  string  $hash
+    * @param  string  $hash
-     * @return \Illuminate\Http\JsonResponse
+    * @return \Illuminate\Http\JsonResponse
-     */
+    */
     public function __invoke(Request $request, $hash)
     {
         $company = Company::where('unique_hash', $hash)->first();
@@ -45,8 +44,6 @@ class TaxSummaryReportController extends Controller
         $dateFormat = CompanySetting::getSetting('carbon_date_format', $company->id);
         $from_date = Carbon::createFromFormat('Y-m-d', $request->from_date)->format($dateFormat);
         $to_date = Carbon::createFromFormat('Y-m-d', $request->to_date)->format($dateFormat);
-        $currency = Currency::findOrFail(CompanySetting::getSetting('currency', $company->id));
-
 
         $colors = [
             'primary_text_color',
@@ -71,7 +68,6 @@ class TaxSummaryReportController extends Controller
             'company' => $company,
             'from_date' => $from_date,
             'to_date' => $to_date,
-            'currency' => $currency,
         ]);
 
         $pdf = PDF::loadView('app.pdf.reports.tax-summary');

app/Http/Controllers/V1/Admin/Settings/CompanyController.php

@@ -3,8 +3,6 @@
 namespace Crater\Http\Controllers\V1\Admin\Settings;
 
 use Crater\Http\Controllers\Controller;
-use Crater\Http\Requests\AvatarRequest;
-use Crater\Http\Requests\CompanyLogoRequest;
 use Crater\Http\Requests\CompanyRequest;
 use Crater\Http\Requests\ProfileRequest;
 use Crater\Http\Resources\CompanyResource;
@@ -50,7 +48,7 @@ class CompanyController extends Controller
 
         $this->authorize('manage company', $company);
 
-        $company->update($request->getCompanyPayload());
+        $company->update($request->only('name'));
 
         $company->address()->updateOrCreate(['company_id' => $company->id], $request->address);
 
@@ -60,10 +58,10 @@ class CompanyController extends Controller
     /**
      * Upload the company logo to storage.
      *
-     * @param  \Crater\Http\Requests\CompanyLogoRequest $request
+     * @param  \Illuminate\Http\Request $request
      * @return \Illuminate\Http\JsonResponse
      */
-    public function uploadCompanyLogo(CompanyLogoRequest $request)
+    public function uploadCompanyLogo(Request $request)
     {
         $company = Company::find($request->header('company'));
 
@@ -71,9 +69,6 @@ class CompanyController extends Controller
 
         $data = json_decode($request->company_logo);
 
-        if (isset($request->is_company_logo_removed) && (bool) $request->is_company_logo_removed) {
-            $company->clearMediaCollection('logo');
-        }
         if ($data) {
             $company = Company::find($request->header('company'));
 
@@ -94,16 +89,13 @@ class CompanyController extends Controller
     /**
      * Upload the Admin Avatar to public storage.
      *
-     * @param  \Crater\Http\Requests\AvatarRequest $request
+     * @param  \Illuminate\Http\Request $request
      * @return \Illuminate\Http\JsonResponse
      */
-    public function uploadAvatar(AvatarRequest $request)
+    public function uploadAvatar(Request $request)
     {
         $user = auth()->user();
 
-        if (isset($request->is_admin_avatar_removed) && (bool) $request->is_admin_avatar_removed) {
-            $user->clearMediaCollection('admin_avatar');
-        }
         if ($user && $request->hasFile('admin_avatar')) {
             $user->clearMediaCollection('admin_avatar');
 

app/Http/Controllers/V1/Admin/Settings/CompanyCurrencyCheckTransactionsController.php

@@ -1,27 +0,0 @@
-<?php
-
-namespace Crater\Http\Controllers\V1\Admin\Settings;
-
-use Crater\Http\Controllers\Controller;
-use Crater\Models\Company;
-use Illuminate\Http\Request;
-
-class CompanyCurrencyCheckTransactionsController extends Controller
-{
-    /**
-     * Handle the incoming request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function __invoke(Request $request)
-    {
-        $company = Company::find($request->header('company'));
-
-        $this->authorize('manage company', $company);
-
-        return response()->json([
-            'has_transactions' => $company->hasTransactions(),
-        ]);
-    }
-}

app/Http/Controllers/V1/Admin/Settings/GetSettingsController.php

@@ -1,28 +0,0 @@
-<?php
-
-namespace Crater\Http\Controllers\V1\Admin\Settings;
-
-use Crater\Http\Controllers\Controller;
-use Crater\Http\Requests\GetSettingRequest;
-use Crater\Models\Setting;
-use Illuminate\Http\Request;
-
-class GetSettingsController extends Controller
-{
-    /**
-     * Handle the incoming request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function __invoke(GetSettingRequest $request)
-    {
-        $this->authorize('manage settings');
-
-        $setting = Setting::getSetting($request->key);
-
-        return response()->json([
-            $request->key => $setting
-        ]);
-    }
-}

app/Http/Controllers/V1/Admin/Settings/TaxTypesController.php

@@ -22,7 +22,6 @@ class TaxTypesController extends Controller
         $limit = $request->has('limit') ? $request->limit : 5;
 
         $taxTypes = TaxType::applyFilters($request->all())
-            ->where('type', TaxType::TYPE_GENERAL)
             ->whereCompany()
             ->latest()
             ->paginateData($limit);

app/Http/Controllers/V1/Admin/Settings/UpdateCompanySettingsController.php

@@ -6,7 +6,6 @@ use Crater\Http\Controllers\Controller;
 use Crater\Http\Requests\UpdateSettingsRequest;
 use Crater\Models\Company;
 use Crater\Models\CompanySetting;
-use Illuminate\Support\Arr;
 
 class UpdateCompanySettingsController extends Controller
 {
@@ -18,23 +17,9 @@ class UpdateCompanySettingsController extends Controller
      */
     public function __invoke(UpdateSettingsRequest $request)
     {
-        $company = Company::find($request->header('company'));
+        $this->authorize('manage company', Company::find($request->header('company')));
-        $this->authorize('manage company', $company);
 
-        $data = $request->settings;
+        CompanySetting::setSettings($request->settings, $request->header('company'));
-
-        if (
-            Arr::exists($data, 'currency') &&
-            (CompanySetting::getSetting('currency', $company->id) !== $data['currency']) &&
-            $company->hasTransactions()
-        ) {
-            return response()->json([
-                'success' => false,
-                'message' => 'Cannot update company currency after transactions are created.'
-            ]);
-        }
-
-        CompanySetting::setSettings($data, $request->header('company'));
 
         return response()->json([
             'success' => true,

app/Http/Controllers/V1/Admin/Settings/UpdateSettingsController.php

@@ -1,29 +0,0 @@
-<?php
-
-namespace Crater\Http\Controllers\V1\Admin\Settings;
-
-use Crater\Http\Controllers\Controller;
-use Crater\Http\Requests\SettingRequest;
-use Crater\Models\Setting;
-use Illuminate\Http\Request;
-
-class UpdateSettingsController extends Controller
-{
-    /**
-     * Handle the incoming request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function __invoke(SettingRequest $request)
-    {
-        $this->authorize('manage settings');
-
-        Setting::setSettings($request->settings);
-
-        return response()->json([
-            'success' => true,
-            $request->settings
-        ]);
-    }
-}

app/Http/Controllers/V1/Customer/Auth/ForgotPasswordController.php

@@ -1,56 +0,0 @@
-<?php
-
-namespace Crater\Http\Controllers\V1\Customer\Auth;
-
-use Crater\Http\Controllers\Controller;
-use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
-use Illuminate\Http\Request;
-use Password;
-
-class ForgotPasswordController extends Controller
-{
-    /*
-    |--------------------------------------------------------------------------
-    | Password Reset Controller
-    |--------------------------------------------------------------------------
-    |
-    | This controller is responsible for handling password reset emails and
-    | includes a trait which assists in sending these notifications from
-    | your application to your users. Feel free to explore this trait.
-    |
-    */
-
-    use SendsPasswordResetEmails;
-
-    public function broker()
-    {
-        return Password::broker('customers');
-    }
-
-    /**
-     * Get the response for a successful password reset link.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  string  $response
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\JsonResponse
-     */
-    protected function sendResetLinkResponse(Request $request, $response)
-    {
-        return response()->json([
-            'message' => 'Password reset email sent.',
-            'data' => $response,
-        ]);
-    }
-
-    /**
-     * Get the response for a failed password reset link.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  string  $response
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\JsonResponse
-     */
-    protected function sendResetLinkFailedResponse(Request $request, $response)
-    {
-        return response('Email could not be sent to this email address.', 403);
-    }
-}

app/Http/Controllers/V1/Customer/Auth/LoginController.php

@@ -1,45 +0,0 @@
-<?php
-
-namespace Crater\Http\Controllers\V1\Customer\Auth;
-
-use Crater\Http\Controllers\Controller;
-use Crater\Http\Requests\Customer\CustomerLoginRequest;
-use Crater\Models\Company;
-use Crater\Models\Customer;
-use Hash;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Validation\ValidationException;
-
-class LoginController extends Controller
-{
-    /**
-     * Handle the incoming request.
-     *
-     * @param  \Crater\Http\Requests\Customer\CustomerLoginRequest  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function __invoke(CustomerLoginRequest $request, Company $company)
-    {
-        $user = Customer::where('email', $request->email)
-            ->where('company_id', $company->id)
-            ->first();
-
-        if (! $user || ! Hash::check($request->password, $user->password)) {
-            throw ValidationException::withMessages([
-                'email' => ['The provided credentials are incorrect.'],
-            ]);
-        }
-
-        if (! $user->enable_portal) {
-            throw ValidationException::withMessages([
-                'email' => ['Customer portal not available for this user.'],
-            ]);
-        }
-
-        Auth::guard('customer')->login($user);
-
-        return response()->json([
-            'success' => true
-        ]);
-    }
-}

app/Http/Controllers/V1/Customer/Auth/ResetPasswordController.php

@@ -1,83 +0,0 @@
-<?php
-
-namespace Crater\Http\Controllers\V1\Customer\Auth;
-
-use Crater\Http\Controllers\Controller;
-use Crater\Providers\RouteServiceProvider;
-use Illuminate\Auth\Events\PasswordReset;
-use Illuminate\Foundation\Auth\ResetsPasswords;
-use Illuminate\Http\Request;
-use Illuminate\Support\Str;
-use Password;
-
-class ResetPasswordController extends Controller
-{
-    /*
-    |--------------------------------------------------------------------------
-    | Password Reset Controller
-    |--------------------------------------------------------------------------
-    |
-    | This controller is responsible for handling password reset requests
-    | and uses a simple trait to include this behavior. You're free to
-    | explore this trait and override any methods you wish to tweak.
-    |
-    */
-
-    use ResetsPasswords;
-
-    /**
-     * Where to redirect users after resetting their password.
-     *
-     * @var string
-     */
-    protected $redirectTo = RouteServiceProvider::CUSTOMER_HOME;
-
-    public function broker()
-    {
-        return Password::broker('customers');
-    }
-
-    /**
-     * Get the response for a successful password reset.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  string  $response
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\JsonResponse
-     */
-    protected function sendResetResponse(Request $request, $response)
-    {
-        return response()->json([
-            'message' => 'Password reset successfully.',
-        ]);
-    }
-
-    /**
-     * Reset the given user's password.
-     *
-     * @param  \Illuminate\Contracts\Auth\CanResetPassword  $user
-     * @param  string  $password
-     * @return void
-     */
-    protected function resetPassword($user, $password)
-    {
-        $user->password = $password;
-
-        $user->setRememberToken(Str::random(60));
-
-        $user->save();
-
-        event(new PasswordReset($user));
-    }
-
-    /**
-     * Get the response for a failed password reset.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  string  $response
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Http\JsonResponse
-     */
-    protected function sendResetFailedResponse(Request $request, $response)
-    {
-        return response('Failed, Invalid Token.', 403);
-    }
-}

app/Http/Controllers/V1/Customer/Estimate/AcceptEstimateController.php

@@ -1,36 +0,0 @@
-<?php
-
-namespace Crater\Http\Controllers\V1\Customer\Estimate;
-
-use Crater\Http\Controllers\Controller;
-use Crater\Http\Resources\Customer\EstimateResource;
-use Crater\Models\Company;
-use Crater\Models\Estimate;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-
-class AcceptEstimateController extends Controller
-{
-    /**
-    * Handle the incoming request.
-    *
-    * @param  \Illuminate\Http\Request  $request
-    * @param  Estimate $estimate
-    * @return \Illuminate\Http\Response
-    */
-    public function __invoke(Request $request, Company $company, $id)
-    {
-        $estimate = $company->estimates()
-            ->whereCustomer(Auth::guard('customer')->id())
-            ->where('id', $id)
-            ->first();
-
-        if (! $estimate) {
-            return response()->json(['error' => 'estimate_not_found'], 404);
-        }
-
-        $estimate->update($request->only('status'));
-
-        return new EstimateResource($estimate);
-    }
-}

app/Http/Controllers/V1/Customer/Estimate/EstimatesController.php

@@ -1,67 +0,0 @@
-<?php
-
-namespace Crater\Http\Controllers\V1\Customer\Estimate;
-
-use Crater\Http\Controllers\Controller;
-use Crater\Http\Resources\Customer\EstimateResource;
-use Crater\Models\Company;
-use Crater\Models\Estimate;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-
-class EstimatesController extends Controller
-{
-    /**
-     * Display a listing of the resource.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function index(Request $request)
-    {
-        $limit = $request->has('limit') ? $request->limit : 10;
-
-        $estimates = Estimate::with([
-                'items',
-                'customer',
-                'taxes',
-                'creator',
-            ])
-            ->where('status', '<>', 'DRAFT')
-            ->whereCustomer(Auth::guard('customer')->id())
-            ->applyFilters($request->only([
-                'status',
-                'estimate_number',
-                'from_date',
-                'to_date',
-                'orderByField',
-                'orderBy',
-            ]))
-            ->latest()
-            ->paginateData($limit);
-
-        return (EstimateResource::collection($estimates))
-            ->additional(['meta' => [
-                'estimateTotalCount' => Estimate::where('status', '<>', 'DRAFT')->whereCustomer(Auth::guard('customer')->id())->count(),
-            ]]);
-    }
-
-    /**
-     * Display the specified resource.
-     *
-     * @param  Estimate $estimate
-     * @return \Illuminate\Http\Response
-     */
-    public function show(Company $company, $id)
-    {
-        $estimate = $company->estimates()
-            ->whereCustomer(Auth::guard('customer')->id())
-            ->where('id', $id)
-            ->first();
-
-        if (! $estimate) {
-            return response()->json(['error' => 'estimate_not_found'], 404);
-        }
-
-        return new EstimateResource($estimate);
-    }
-}

app/Http/Controllers/V1/Customer/EstimatePdfController.php

@@ -3,51 +3,41 @@
 namespace Crater\Http\Controllers\V1\Customer;
 
 use Crater\Http\Controllers\Controller;
-use Crater\Http\Resources\EstimateResource;
 use Crater\Mail\EstimateViewedMail;
 use Crater\Models\CompanySetting;
 use Crater\Models\Customer;
-use Crater\Models\EmailLog;
 use Crater\Models\Estimate;
-use Illuminate\Http\Request;
 
 class EstimatePdfController extends Controller
 {
-    public function getPdf(EmailLog $emailLog, Request $request)
+    /**
+     * Handle the incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function __invoke(Estimate $estimate)
     {
-        $estimate = Estimate::find($emailLog->mailable_id);
+        if ($estimate && ($estimate->status == Estimate::STATUS_SENT || $estimate->status == Estimate::STATUS_DRAFT)) {
+            $estimate->status = Estimate::STATUS_VIEWED;
+            $estimate->save();
+            $notifyEstimateViewed = CompanySetting::getSetting(
+                'notify_estimate_viewed',
+                $estimate->company_id
+            );
 
-        if (! $emailLog->isExpired()) {
+            if ($notifyEstimateViewed == 'YES') {
-            if ($estimate && ($estimate->status == Estimate::STATUS_SENT || $estimate->status == Estimate::STATUS_DRAFT)) {
+                $data['estimate'] = Estimate::findOrFail($estimate->id)->toArray();
-                $estimate->status = Estimate::STATUS_VIEWED;
+                $data['user'] = Customer::find($estimate->customer_id)->toArray();
-                $estimate->save();
+                $notificationEmail = CompanySetting::getSetting(
-                $notifyEstimateViewed = CompanySetting::getSetting(
+                    'notification_email',
-                    'notify_estimate_viewed',
                     $estimate->company_id
                 );
 
-                if ($notifyEstimateViewed == 'YES') {
+                \Mail::to($notificationEmail)->send(new EstimateViewedMail($data));
-                    $data['estimate'] = Estimate::findOrFail($estimate->id)->toArray();
-                    $data['user'] = Customer::find($estimate->customer_id)->toArray();
-                    $notificationEmail = CompanySetting::getSetting(
-                        'notification_email',
-                        $estimate->company_id
-                    );
-
-                    \Mail::to($notificationEmail)->send(new EstimateViewedMail($data));
-                }
             }
-
-            return $estimate->getGeneratedPDFOrStream('estimate');
         }
 
-        abort(403, 'Link Expired.');
+        return $estimate->getGeneratedPDFOrStream('estimate');
-    }
-
-    public function getEstimate(EmailLog $emailLog)
-    {
-        $estimate = Estimate::find($emailLog->mailable_id);
-
-        return new EstimateResource($estimate);
     }
 }

app/Http/Controllers/V1/Customer/Expense/ExpensesController.php

@@ -1,59 +0,0 @@
-<?php
-
-namespace Crater\Http\Controllers\V1\Customer\Expense;
-
-use Crater\Http\Controllers\Controller;
-use Crater\Http\Resources\Customer\ExpenseResource;
-use Crater\Models\Company;
-use Crater\Models\Expense;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-
-class ExpensesController extends Controller
-{
-    /**
-     * Display a listing of the resource.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function index(Request $request)
-    {
-        $limit = $request->has('limit') ? $request->limit : 10;
-
-        $expenses = Expense::with('category', 'creator', 'fields')
-            ->whereUser(Auth::guard('customer')->id())
-            ->applyFilters($request->only([
-                'expense_category_id',
-                'from_date',
-                'to_date',
-                'orderByField',
-                'orderBy',
-            ]))
-            ->paginateData($limit);
-
-        return (ExpenseResource::collection($expenses))
-            ->additional(['meta' => [
-                'expenseTotalCount' => Expense::whereCustomer(Auth::guard('customer')->id())->count(),
-            ]]);
-    }
-
-    /**
-     * Display the specified resource.
-     *
-     * @param  \Crater\Models\Expense  $expense
-     * @return \Illuminate\Http\Response
-     */
-    public function show(Company $company, $id)
-    {
-        $expense = $company->expenses()
-            ->whereUser(Auth::guard('customer')->id())
-            ->where('id', $id)
-            ->first();
-
-        if (! $expense) {
-            return response()->json(['error' => 'expense_not_found'], 404);
-        }
-
-        return new ExpenseResource($expense);
-    }
-}

app/Http/Controllers/V1/Customer/General/BootstrapController.php

@@ -1,40 +0,0 @@
-<?php
-
-namespace Crater\Http\Controllers\V1\Customer\General;
-
-use Crater\Http\Controllers\Controller;
-use Crater\Http\Resources\Customer\CustomerResource;
-use Crater\Models\Currency;
-use Crater\Models\Module;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-
-class BootstrapController extends Controller
-{
-    /**
-     * Handle the incoming request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function __invoke(Request $request)
-    {
-        $customer = Auth::guard('customer')->user();
-
-        foreach (\Menu::get('customer_portal_menu')->items->toArray() as $data) {
-            if ($customer) {
-                $menu[] = [
-                    'title' => $data->title,
-                    'link' => $data->link->path['url'],
-                ];
-            }
-        }
-
-        return (new CustomerResource($customer))
-            ->additional(['meta' => [
-                'menu' => $menu,
-                'current_customer_currency' => Currency::find($customer->currency_id),
-                'modules' => Module::where('enabled', true)->pluck('name'),
-            ]]);
-    }
-}

app/Http/Controllers/V1/Customer/General/DashboardController.php

@@ -1,45 +0,0 @@
-<?php
-
-namespace Crater\Http\Controllers\V1\Customer\General;
-
-use Crater\Http\Controllers\Controller;
-use Crater\Models\Estimate;
-use Crater\Models\Invoice;
-use Crater\Models\Payment;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-
-class DashboardController extends Controller
-{
-    /**
-     * Handle the incoming request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function __invoke(Request $request)
-    {
-        $user = Auth::guard('customer')->user();
-
-        $amountDue = Invoice::whereCustomer($user->id)
-            ->where('status', '<>', 'DRAFT')
-            ->sum('due_amount');
-        $invoiceCount = Invoice::whereCustomer($user->id)
-            ->where('status', '<>', 'DRAFT')
-            ->count();
-        $estimatesCount = Estimate::whereCustomer($user->id)
-            ->where('status', '<>', 'DRAFT')
-            ->count();
-        $paymentCount = Payment::whereCustomer($user->id)
-            ->count();
-
-        return response()->json([
-            'due_amount' => $amountDue,
-            'recentInvoices' => Invoice::whereCustomer($user->id)->where('status', '<>', 'DRAFT')->take(5)->latest()->get(),
-            'recentEstimates' => Estimate::whereCustomer($user->id)->where('status', '<>', 'DRAFT')->take(5)->latest()->get(),
-            'invoice_count' => $invoiceCount,
-            'estimate_count' => $estimatesCount,
-            'payment_count' => $paymentCount,
-        ]);
-    }
-}

app/Http/Controllers/V1/Customer/General/ProfileController.php

@@ -1,49 +0,0 @@
-<?php
-
-namespace Crater\Http\Controllers\V1\Customer\General;
-
-use Crater\Http\Controllers\Controller;
-use Crater\Http\Requests\Customer\CustomerProfileRequest;
-use Crater\Http\Resources\Customer\CustomerResource;
-use Crater\Models\Company;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-
-class ProfileController extends Controller
-{
-    public function updateProfile(Company $company, CustomerProfileRequest $request)
-    {
-        $customer = Auth::guard('customer')->user();
-
-        $customer->update($request->validated());
-
-        if (isset($request->is_customer_avatar_removed) && (bool) $request->is_customer_avatar_removed) {
-            $customer->clearMediaCollection('customer_avatar');
-        }
-        if ($customer && $request->hasFile('customer_avatar')) {
-            $customer->clearMediaCollection('customer_avatar');
-
-            $customer->addMediaFromRequest('customer_avatar')
-            ->toMediaCollection('customer_avatar');
-        }
-
-        if ($request->billing !== null) {
-            $customer->shippingAddress()->delete();
-            $customer->addresses()->create($request->getShippingAddress());
-        }
-
-        if ($request->shipping !== null) {
-            $customer->billingAddress()->delete();
-            $customer->addresses()->create($request->getBillingAddress());
-        }
-
-        return new CustomerResource($customer);
-    }
-
-    public function getUser(Request $request)
-    {
-        $customer = Auth::guard('customer')->user();
-
-        return new CustomerResource($customer);
-    }
-}

app/Http/Controllers/V1/Customer/Invoice/InvoicesController.php

@@ -1,49 +0,0 @@
-<?php
-
-namespace Crater\Http\Controllers\V1\Customer\Invoice;
-
-use Crater\Http\Controllers\Controller;
-use Crater\Http\Resources\Customer\InvoiceResource;
-use Crater\Models\Company;
-use Crater\Models\Invoice;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-
-class InvoicesController extends Controller
-{
-    /**
-     * Display a listing of the resource.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function index(Request $request)
-    {
-        $limit = $request->has('limit') ? $request->limit : 10;
-
-        $invoices = Invoice::with(['items', 'customer', 'creator', 'taxes'])
-            ->where('status', '<>', 'DRAFT')
-            ->applyFilters($request->all())
-            ->whereCustomer(Auth::guard('customer')->id())
-            ->latest()
-            ->paginateData($limit);
-
-        return (InvoiceResource::collection($invoices))
-            ->additional(['meta' => [
-                'invoiceTotalCount' => Invoice::where('status', '<>', 'DRAFT')->whereCustomer(Auth::guard('customer')->id())->count(),
-            ]]);
-    }
-
-    public function show(Company $company, $id)
-    {
-        $invoice = $company->invoices()
-            ->whereCustomer(Auth::guard('customer')->id())
-            ->where('id', $id)
-            ->first();
-
-        if (! $invoice) {
-            return response()->json(['error' => 'invoice_not_found'], 404);
-        }
-
-        return new InvoiceResource($invoice);
-    }
-}

app/Http/Controllers/V1/Customer/InvoicePdfController.php

@@ -3,59 +3,42 @@
 namespace Crater\Http\Controllers\V1\Customer;
 
 use Crater\Http\Controllers\Controller;
-use Crater\Http\Resources\Customer\InvoiceResource as CustomerInvoiceResource;
 use Crater\Mail\InvoiceViewedMail;
 use Crater\Models\CompanySetting;
 use Crater\Models\Customer;
-use Crater\Models\EmailLog;
 use Crater\Models\Invoice;
-use Illuminate\Http\Request;
 
 class InvoicePdfController extends Controller
 {
-    public function getPdf(EmailLog $emailLog, Request $request)
+    /**
+     * Handle the incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function __invoke(Invoice $invoice)
     {
-        $invoice = Invoice::find($emailLog->mailable_id);
+        if ($invoice && ($invoice->status == Invoice::STATUS_SENT || $invoice->status == Invoice::STATUS_DRAFT)) {
+            $invoice->status = Invoice::STATUS_VIEWED;
+            $invoice->viewed = true;
+            $invoice->save();
+            $notifyInvoiceViewed = CompanySetting::getSetting(
+                'notify_invoice_viewed',
+                $invoice->company_id
+            );
 
-        if (! $emailLog->isExpired()) {
+            if ($notifyInvoiceViewed == 'YES') {
-            if ($invoice && ($invoice->status == Invoice::STATUS_SENT || $invoice->status == Invoice::STATUS_DRAFT)) {
+                $data['invoice'] = Invoice::findOrFail($invoice->id)->toArray();
-                $invoice->status = Invoice::STATUS_VIEWED;
+                $data['user'] = Customer::find($invoice->customer_id)->toArray();
-                $invoice->viewed = true;
+                $notificationEmail = CompanySetting::getSetting(
-                $invoice->save();
+                    'notification_email',
-                $notifyInvoiceViewed = CompanySetting::getSetting(
-                    'notify_invoice_viewed',
                     $invoice->company_id
                 );
 
-                if ($notifyInvoiceViewed == 'YES') {
+                \Mail::to($notificationEmail)->send(new InvoiceViewedMail($data));
-                    $data['invoice'] = Invoice::findOrFail($invoice->id)->toArray();
-                    $data['user'] = Customer::find($invoice->customer_id)->toArray();
-                    $notificationEmail = CompanySetting::getSetting(
-                        'notification_email',
-                        $invoice->company_id
-                    );
-
-                    \Mail::to($notificationEmail)->send(new InvoiceViewedMail($data));
-                }
             }
-
-            if ($request->has('pdf')) {
-                return $invoice->getGeneratedPDFOrStream('invoice');
-            }
-
-            return view('app')->with([
-                'customer_logo' => get_company_setting('customer_portal_logo', $invoice->company_id),
-                'current_theme' => get_company_setting('customer_portal_theme', $invoice->company_id)
-            ]);
         }
 
-        abort(403, 'Link Expired.');
+        return $invoice->getGeneratedPDFOrStream('invoice');
-    }
-
-    public function getInvoice(EmailLog $emailLog)
-    {
-        $invoice = Invoice::find($emailLog->mailable_id);
-
-        return new CustomerInvoiceResource($invoice);
     }
 }

app/Http/Controllers/V1/Customer/Payment/PaymentMethodController.php

@@ -1,23 +0,0 @@
-<?php
-
-namespace Crater\Http\Controllers\V1\Customer\Payment;
-
-use Crater\Http\Controllers\Controller;
-use Crater\Http\Resources\Customer\PaymentMethodResource;
-use Crater\Models\Company;
-use Crater\Models\PaymentMethod;
-use Illuminate\Http\Request;
-
-class PaymentMethodController extends Controller
-{
-    /**
-     * Handle the incoming request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function __invoke(Request $request, Company $company)
-    {
-        return PaymentMethodResource::collection(PaymentMethod::where('company_id', $company->id)->get());
-    }
-}

app/Http/Controllers/V1/Customer/Payment/PaymentsController.php

@@ -1,61 +0,0 @@
-<?php
-
-namespace Crater\Http\Controllers\V1\Customer\Payment;
-
-use Crater\Http\Controllers\Controller;
-use Crater\Http\Resources\Customer\PaymentResource;
-use Crater\Models\Company;
-use Crater\Models\Payment;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-
-class PaymentsController extends Controller
-{
-    /**
-     * Display a listing of the resource.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function index(Request $request)
-    {
-        $limit = $request->has('limit') ? $request->limit : 10;
-
-        $payments = Payment::with(['customer', 'invoice', 'paymentMethod', 'creator'])
-            ->whereCustomer(Auth::guard('customer')->id())
-            ->leftJoin('invoices', 'invoices.id', '=', 'payments.invoice_id')
-            ->applyFilters($request->only([
-                'payment_number',
-                'payment_method_id',
-                'orderByField',
-                'orderBy',
-            ]))
-            ->select('payments.*', 'invoices.invoice_number')
-            ->latest()
-            ->paginateData($limit);
-
-        return (PaymentResource::collection($payments))
-            ->additional(['meta' => [
-                'paymentTotalCount' => Payment::whereCustomer(Auth::guard('customer')->id())->count(),
-            ]]);
-    }
-
-    /**
-     * Display the specified resource.
-     *
-     * @param  \Crater\Models\Payment  $payment
-     * @return \Illuminate\Http\Response
-     */
-    public function show(Company $company, $id)
-    {
-        $payment = $company->payments()
-            ->whereCustomer(Auth::guard('customer')->id())
-            ->where('id', $id)
-            ->first();
-
-        if (! $payment) {
-            return response()->json(['error' => 'payment_not_found'], 404);
-        }
-
-        return new PaymentResource($payment);
-    }
-}

app/Http/Controllers/V1/Customer/PaymentPdfController.php

@@ -1,28 +0,0 @@
-<?php
-
-namespace Crater\Http\Controllers\V1\Customer;
-
-use Crater\Http\Controllers\Controller;
-use Crater\Http\Resources\PaymentResource;
-use Crater\Models\EmailLog;
-use Crater\Models\Payment;
-use Illuminate\Http\Request;
-
-class PaymentPdfController extends Controller
-{
-    public function getPdf(EmailLog $emailLog, Request $request)
-    {
-        if (! $emailLog->isExpired()) {
-            return $emailLog->mailable->getGeneratedPDFOrStream('payment');
-        }
-
-        abort(403, 'Link Expired.');
-    }
-
-    public function getPayment(EmailLog $emailLog)
-    {
-        $payment = Payment::find($emailLog->mailable_id);
-
-        return new PaymentResource($payment);
-    }
-}

app/Http/Controllers/V1/Modules/ScriptController.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace Crater\Http\Controllers\V1\Modules;
-
-use Crater\Http\Controllers\Controller;
-use Crater\Services\Module\ModuleFacade;
-use DateTime;
-use Illuminate\Support\Arr;
-use Request;
-
-class ScriptController extends Controller
-{
-    /**
-     * Serve the requested script.
-     *
-     * @param  \Request  $request
-     * @return \Illuminate\Http\Response
-     *
-     * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
-     */
-    public function __invoke(Request $request, string $script)
-    {
-        $path = Arr::get(ModuleFacade::allScripts(), $script);
-
-        abort_if(is_null($path), 404);
-
-        return response(
-            file_get_contents($path),
-            200,
-            [
-                'Content-Type' => 'application/javascript',
-            ]
-        )->setLastModified(DateTime::createFromFormat('U', filemtime($path)));
-    }
-}

app/Http/Controllers/V1/Modules/StyleController.php

@@ -1,35 +0,0 @@
-<?php
-
-namespace Crater\Http\Controllers\V1\Modules;
-
-use Crater\Http\Controllers\Controller;
-use Crater\Services\Module\ModuleFacade;
-use DateTime;
-use Illuminate\Support\Arr;
-use Request;
-
-class StyleController extends Controller
-{
-    /**
-     * Serve the requested stylesheet.
-     *
-     * @param  \Request  $request
-     * @return \Illuminate\Http\Response
-     *
-     * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
-     */
-    public function __invoke(Request $request, string $style)
-    {
-        $path = Arr::get(ModuleFacade::allStyles(), $style);
-
-        abort_if(is_null($path), 404);
-
-        return response(
-            file_get_contents($path),
-            200,
-            [
-                'Content-Type' => 'text/css',
-            ]
-        )->setLastModified(DateTime::createFromFormat('U', filemtime($path)));
-    }
-}

app/Http/Controllers/V1/PDF/DownloadReceiptController.php

@@ -17,8 +17,6 @@ class DownloadReceiptController extends Controller
      */
     public function __invoke(Expense $expense)
     {
-        $this->authorize('view', $expense);
-
         if ($expense) {
             $media = $expense->getFirstMedia('receipts');
             if ($media) {

app/Http/Controllers/V1/PDF/EstimatePdfController.php

@@ -4,7 +4,6 @@ namespace Crater\Http\Controllers\V1\PDF;
 
 use Crater\Http\Controllers\Controller;
 use Crater\Models\Estimate;
-use Illuminate\Http\Request;
 
 class EstimatePdfController extends Controller
 {
@@ -14,13 +13,8 @@ class EstimatePdfController extends Controller
      * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Http\Response
      */
-    public function __invoke(Request $request, Estimate $estimate)
+    public function __invoke(Estimate $estimate)
     {
-        if ($request->has('preview')) {
-            return $estimate->getPDFData();
-        }
-
-
         return $estimate->getGeneratedPDFOrStream('estimate');
     }
 }

app/Http/Controllers/V1/PDF/InvoicePdfController.php

@@ -4,7 +4,6 @@ namespace Crater\Http\Controllers\V1\PDF;
 
 use Crater\Http\Controllers\Controller;
 use Crater\Models\Invoice;
-use Illuminate\Http\Request;
 
 class InvoicePdfController extends Controller
 {
@@ -14,12 +13,8 @@ class InvoicePdfController extends Controller
      * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Http\Response
      */
-    public function __invoke(Request $request, Invoice $invoice)
+    public function __invoke(Invoice $invoice)
     {
-        if ($request->has('preview')) {
-            return $invoice->getPDFData();
-        }
-
         return $invoice->getGeneratedPDFOrStream('invoice');
     }
 }

app/Http/Controllers/V1/PDF/PaymentPdfController.php

@@ -4,7 +4,6 @@ namespace Crater\Http\Controllers\V1\PDF;
 
 use Crater\Http\Controllers\Controller;
 use Crater\Models\Payment;
-use Illuminate\Http\Request;
 
 class PaymentPdfController extends Controller
 {
@@ -14,12 +13,8 @@ class PaymentPdfController extends Controller
      * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Http\Response
      */
-    public function __invoke(Request $request, Payment $payment)
+    public function __invoke(Payment $payment)
     {
-        if ($request->has('preview')) {
-            return view('app.pdf.payment.payment');
-        }
-
         return $payment->getGeneratedPDFOrStream('payment');
     }
 }

app/Http/Controllers/V1/Webhook/CronJobController.php

@@ -1,23 +0,0 @@
-<?php
-
-namespace Crater\Http\Controllers\V1\Webhook;
-
-use Crater\Http\Controllers\Controller;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Artisan;
-
-class CronJobController extends Controller
-{
-    /**
-     * Handle the incoming request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function __invoke(Request $request)
-    {
-        Artisan::call('schedule:run');
-
-        return response()->json(['success' => true]);
-    }
-}

app/Http/Kernel.php

@@ -69,9 +69,6 @@ class Kernel extends HttpKernel
         'redirect-if-unauthenticated' => \Crater\Http\Middleware\RedirectIfUnauthorized::class,
         'customer-guest' => \Crater\Http\Middleware\CustomerGuest::class,
         'company' => \Crater\Http\Middleware\CompanyMiddleware::class,
-        'pdf-auth' => \Crater\Http\Middleware\PdfMiddleware::class,
-        'cron-job' => \Crater\Http\Middleware\CronJobMiddleware::class,
-        'customer-portal' => \Crater\Http\Middleware\CustomerPortalMiddleware::class,
     ];
 
     /**

app/Http/Middleware/ConfigMiddleware.php

@@ -3,6 +3,7 @@
 namespace Crater\Http\Middleware;
 
 use Closure;
+use Crater\Models\CompanySetting;
 use Crater\Models\FileDisk;
 
 class ConfigMiddleware
@@ -17,6 +18,15 @@ class ConfigMiddleware
     public function handle($request, Closure $next)
     {
         if (\Storage::disk('local')->has('database_created')) {
+            $setting = CompanySetting::getSetting('time_zone', $request->header('company'));
+
+            $timezone = config('app.timezone');
+
+            if ($setting && $setting != null && $setting != $timezone) {
+                config(['app.timezone' => $setting]);
+                date_default_timezone_set($setting);
+            }
+
             if ($request->has('file_disk_id')) {
                 $file_disk = FileDisk::find($request->file_disk_id);
             } else {

app/Http/Middleware/CronJobMiddleware.php

@@ -1,25 +0,0 @@
-<?php
-
-namespace Crater\Http\Middleware;
-
-use Closure;
-use Illuminate\Http\Request;
-
-class CronJobMiddleware
-{
-    /**
-     * Handle an incoming request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure  $next
-     * @return mixed
-     */
-    public function handle(Request $request, Closure $next)
-    {
-        if ($request->header('x-authorization-token') && $request->header('x-authorization-token') == config('services.cron_job.auth_token')) {
-            return $next($request);
-        }
-
-        return response()->json(['unauthorized'], 401);
-    }
-}

app/Http/Middleware/CustomerPortalMiddleware.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace Crater\Http\Middleware;
-
-use Closure;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-
-class CustomerPortalMiddleware
-{
-    /**
-     * Handle an incoming request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse)  $next
-     * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse
-     */
-    public function handle(Request $request, Closure $next)
-    {
-        $user = Auth::guard('customer')->user();
-
-        if (! $user->enable_portal) {
-            Auth::guard('customer')->logout();
-
-            return response('Unauthorized.', 401);
-        }
-
-        return $next($request);
-    }
-}

app/Http/Middleware/PdfMiddleware.php

@@ -1,26 +0,0 @@
-<?php
-
-namespace Crater\Http\Middleware;
-
-use Closure;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-
-class PdfMiddleware
-{
-    /**
-     * Handle an incoming request.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @param  \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse)  $next
-     * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse
-     */
-    public function handle(Request $request, Closure $next)
-    {
-        if (Auth::guard('web')->check() || Auth::guard('sanctum')->check() || Auth::guard('customer')->check()) {
-            return $next($request);
-        }
-
-        return redirect('/login');
-    }
-}

app/Http/Requests/AvatarRequest.php

@@ -1,40 +0,0 @@
-<?php
-
-namespace Crater\Http\Requests;
-
-use Crater\Rules\Base64Mime;
-use Illuminate\Foundation\Http\FormRequest;
-
-class AvatarRequest extends FormRequest
-{
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return true;
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-            'admin_avatar' => [
-                'nullable',
-                'file',
-                'mimes:gif,jpg,png',
-                'max:20000'
-            ],
-            'avatar' => [
-                'nullable',
-                new Base64Mime(['gif', 'jpg', 'png'])
-            ]
-        ];
-    }
-}

app/Http/Requests/CompaniesRequest.php

@@ -33,10 +33,6 @@ class CompaniesRequest extends FormRequest
             'currency' => [
                 'required'
             ],
-            'slug' => [
-                'required',
-                Rule::unique('companies')
-            ],
             'address.name' => [
                 'nullable',
             ],
@@ -71,8 +67,7 @@ class CompaniesRequest extends FormRequest
     {
         return collect($this->validated())
             ->only([
-                'name',
+                'name'
-                'slug'
             ])
             ->merge([
                 'owner_id' => $this->user()->id

app/Http/Requests/CompanyLogoRequest.php

@@ -1,34 +0,0 @@
-<?php
-
-namespace Crater\Http\Requests;
-
-use Crater\Rules\Base64Mime;
-use Illuminate\Foundation\Http\FormRequest;
-
-class CompanyLogoRequest extends FormRequest
-{
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return true;
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-            'company_logo' => [
-                'nullable',
-                new Base64Mime(['gif', 'jpg', 'png'])
-            ]
-        ];
-    }
-}

app/Http/Requests/CompanyRequest.php

@@ -29,23 +29,9 @@ class CompanyRequest extends FormRequest
                 'required',
                 Rule::unique('companies')->ignore($this->header('company'), 'id'),
             ],
-            'slug' => [
-                'required',
-                Rule::unique('companies')->ignore($this->header('company'), 'id'),
-            ],
             'address.country_id' => [
                 'required',
             ],
         ];
     }
-
-    public function getCompanyPayload()
-    {
-        return collect($this->validated())
-            ->only([
-                'name',
-                'slug'
-            ])
-            ->toArray();
-    }
 }

app/Http/Requests/Customer/CustomerLoginRequest.php

@@ -1,37 +0,0 @@
-<?php
-
-namespace Crater\Http\Requests\Customer;
-
-use Illuminate\Foundation\Http\FormRequest;
-
-class CustomerLoginRequest extends FormRequest
-{
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return true;
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-            'email' => [
-                'required',
-                'string'
-            ],
-            'password' => [
-                'required',
-                'string'
-            ]
-        ];
-    }
-}

app/Http/Requests/CustomerEstimateStatusRequest.php

@@ -1,33 +0,0 @@
-<?php
-
-namespace Crater\Http\Requests;
-
-use Illuminate\Foundation\Http\FormRequest;
-
-class CustomerEstimateStatusRequest extends FormRequest
-{
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return true;
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-            'status' => [
-                'required',
-                'in:ACCEPTED,REJECTED',
-            ]
-        ];
-    }
-}

app/Http/Requests/CustomerRequest.php

@@ -54,8 +54,7 @@ class CustomerRequest extends FormRequest
                 'nullable',
             ],
             'enable_portal' => [
-
+                'nullable',
-                'boolean'
             ],
             'currency_id' => [
                 'nullable',
@@ -120,7 +119,7 @@ class CustomerRequest extends FormRequest
             $rules['email'] = [
                 'email',
                 'nullable',
-                Rule::unique('customers')->where('company_id', $this->header('company'))->ignore($this->route('customer')->id),
+                Rule::unique('customers')->ignore($this->route('customer')->id),
             ];
         };
 

app/Http/Requests/ExpenseRequest.php

@@ -51,12 +51,6 @@ class ExpenseRequest extends FormRequest
             'currency_id' => [
                 'required'
             ],
-            'attachment_receipt' => [
-                'nullable',
-                'file',
-                'mimes:jpg,png,pdf,doc,docx,xls,xlsx,ppt,pptx',
-                'max:20000'
-            ]
         ];
 
         if ($companyCurrency && $this->currency_id) {

app/Http/Requests/GetSettingRequest.php

@@ -1,33 +0,0 @@
-<?php
-
-namespace Crater\Http\Requests;
-
-use Illuminate\Foundation\Http\FormRequest;
-
-class GetSettingRequest extends FormRequest
-{
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return true;
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-            'key' => [
-                'required',
-                'string'
-            ]
-        ];
-    }
-}

app/Http/Requests/PaymentMethodRequest.php

@@ -2,7 +2,6 @@
 
 namespace Crater\Http\Requests;
 
-use Crater\Models\PaymentMethod;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
 
@@ -44,14 +43,4 @@ class PaymentMethodRequest extends FormRequest
 
         return $data;
     }
-
-    public function getPaymentMethodPayload()
-    {
-        return collect($this->validated())
-            ->merge([
-                'company_id' => $this->header('company'),
-                'type' => PaymentMethod::TYPE_GENERAL,
-            ])
-            ->toArray();
-    }
 }

app/Http/Requests/SettingRequest.php

@@ -24,7 +24,10 @@ class SettingRequest extends FormRequest
     public function rules()
     {
         return [
-            'settings' => [
+            'key' => [
+                'required',
+            ],
+            'value' => [
                 'required',
             ],
         ];

app/Http/Requests/TaxTypeRequest.php

@@ -2,7 +2,6 @@
 
 namespace Crater\Http\Requests;
 
-use Crater\Models\TaxType;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
 
@@ -29,7 +28,6 @@ class TaxTypeRequest extends FormRequest
             'name' => [
                 'required',
                 Rule::unique('tax_types')
-                ->where('type', TaxType::TYPE_GENERAL)
                 ->where('company_id', $this->header('company'))
             ],
             'percent' => [
@@ -51,7 +49,6 @@ class TaxTypeRequest extends FormRequest
                 'required',
                 Rule::unique('tax_types')
                     ->ignore($this->route('tax_type')->id)
-                    ->where('type', TaxType::TYPE_GENERAL)
                     ->where('company_id', $this->header('company'))
             ];
         }
@@ -63,8 +60,7 @@ class TaxTypeRequest extends FormRequest
     {
         return collect($this->validated())
             ->merge([
-                'company_id' => $this->header('company'),
+                'company_id' => $this->header('company')
-                'type' => TaxType::TYPE_GENERAL
             ])
             ->toArray();
     }

app/Http/Requests/UnzipUpdateRequest.php

@@ -1,37 +0,0 @@
-<?php
-
-namespace Crater\Http\Requests;
-
-use Illuminate\Foundation\Http\FormRequest;
-
-class UnzipUpdateRequest extends FormRequest
-{
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return true;
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-            'path' => [
-                'required',
-                'regex:/^[\.\/\w\-]+$/'
-            ],
-            'module' => [
-                'required',
-                'string'
-            ]
-        ];
-    }
-}

app/Http/Requests/UploadExpenseReceiptRequest.php

@@ -1,34 +0,0 @@
-<?php
-
-namespace Crater\Http\Requests;
-
-use Crater\Rules\Base64Mime;
-use Illuminate\Foundation\Http\FormRequest;
-
-class UploadExpenseReceiptRequest extends FormRequest
-{
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return true;
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-            'attachment_receipt' => [
-                'nullable',
-                new Base64Mime(['gif', 'jpg', 'png'])
-            ]
-        ];
-    }
-}

app/Http/Requests/UploadModuleRequest.php

@@ -1,40 +0,0 @@
-<?php
-
-namespace Crater\Http\Requests;
-
-use Illuminate\Foundation\Http\FormRequest;
-
-class UploadModuleRequest extends FormRequest
-{
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return true;
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-            'avatar' => [
-                'required',
-                'file',
-                'mimes:zip',
-                'max:20000'
-            ],
-            'module' => [
-                'required',
-                'string',
-                'max:100'
-            ]
-        ];
-    }
-}

app/Http/Resources/CompanyResource.php

@@ -21,7 +21,6 @@ class CompanyResource extends JsonResource
             'logo_path' => $this->logo_path,
             'unique_hash' => $this->unique_hash,
             'owner_id' => $this->owner_id,
-            'slug' => $this->slug,
             'address' => $this->when($this->address()->exists(), function () {
                 return new AddressResource($this->address);
             }),

app/Http/Resources/CustomFieldValueResource.php

@@ -2,7 +2,6 @@
 
 namespace Crater\Http\Resources;
 
-use Crater\Models\CompanySetting;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 class CustomFieldValueResource extends JsonResource
@@ -29,7 +28,6 @@ class CustomFieldValueResource extends JsonResource
             'custom_field_id' => $this->custom_field_id,
             'company_id' => $this->company_id,
             'default_answer' => $this->defaultAnswer,
-            'default_formatted_answer' => $this->dateTimeFormat(),
             'custom_field' => $this->when($this->customField()->exists(), function () {
                 return new CustomFieldResource($this->customField);
             }),
@@ -38,24 +36,4 @@ class CustomFieldValueResource extends JsonResource
             }),
         ];
     }
-
-    public function dateTimeFormat()
-    {
-        $key = getCustomFieldValueKey($this->type);
-
-        $answer = $this->default_answer;
-        if (! $answer) {
-            return null;
-        }
-
-        if ($key == 'date_time_answer') {
-            return $answer->format('Y-m-d H:i');
-        }
-
-        if ($key == 'date_answer') {
-            return $answer->format(CompanySetting::getSetting('carbon_date_format', $this->company_id));
-        }
-
-        return $answer;
-    }
 }

app/Http/Resources/Customer/AddressCollection.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace Crater\Http\Resources\Customer;
-
-use Illuminate\Http\Resources\Json\ResourceCollection;
-
-class AddressCollection extends ResourceCollection
-{
-    /**
-     * Transform the resource collection into an array.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        return parent::toArray($request);
-    }
-}

app/Http/Resources/Customer/AddressResource.php

@@ -1,40 +0,0 @@
-<?php
-
-namespace Crater\Http\Resources\Customer;
-
-use Illuminate\Http\Resources\Json\JsonResource;
-
-class AddressResource 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,
-            'address_street_1' => $this->address_street_1,
-            'address_street_2' => $this->address_street_2,
-            'city' => $this->city,
-            'state' => $this->state,
-            'country_id' => $this->country_id,
-            'zip' => $this->zip,
-            'phone' => $this->phone,
-            'fax' => $this->fax,
-            'type' => $this->type,
-            'user_id' => $this->user_id,
-            'company_id' => $this->company_id,
-            'customer_id' => $this->customer_id,
-            'country' => $this->when($this->country()->exists(), function () {
-                return new CountryResource($this->country);
-            }),
-            'user' => $this->when($this->user()->exists(), function () {
-                return new UserResource($this->user);
-            }),
-        ];
-    }
-}

app/Http/Resources/Customer/CompanyResource.php

@@ -1,30 +0,0 @@
-<?php
-
-namespace Crater\Http\Resources\Customer;
-
-use Illuminate\Http\Resources\Json\JsonResource;
-
-class CompanyResource 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,
-            'slug' => $this->slug,
-            'logo' => $this->logo,
-            'logo_path' => $this->logo_path,
-            'unique_hash' => $this->unique_hash,
-            'owner_id' => $this->owner_id,
-            'address' => $this->when($this->address()->exists(), function () {
-                return new AddressResource($this->address);
-            }),
-        ];
-    }
-}

app/Http/Resources/Customer/CountryCollection.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace Crater\Http\Resources\Customer;
-
-use Illuminate\Http\Resources\Json\ResourceCollection;
-
-class CountryCollection extends ResourceCollection
-{
-    /**
-     * Transform the resource collection into an array.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        return parent::toArray($request);
-    }
-}

app/Http/Resources/Customer/CountryResource.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace Crater\Http\Resources\Customer;
-
-use Illuminate\Http\Resources\Json\JsonResource;
-
-class CountryResource extends JsonResource
-{
-    /**
-     * Transform the resource into an array.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        return [
-            'id' => $this->id,
-            'code' => $this->code,
-            'name' => $this->name,
-            'phonecode' => $this->phonecode,
-        ];
-    }
-}

app/Http/Resources/Customer/CurrencyCollection.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace Crater\Http\Resources\Customer;
-
-use Illuminate\Http\Resources\Json\ResourceCollection;
-
-class CurrencyCollection extends ResourceCollection
-{
-    /**
-     * Transform the resource collection into an array.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        return parent::toArray($request);
-    }
-}

app/Http/Resources/Customer/CurrencyResource.php

@@ -1,29 +0,0 @@
-<?php
-
-namespace Crater\Http\Resources\Customer;
-
-use Illuminate\Http\Resources\Json\JsonResource;
-
-class CurrencyResource 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,
-            'code' => $this->code,
-            'symbol' => $this->symbol,
-            'precision' => $this->precision,
-            'thousand_separator' => $this->thousand_separator,
-            'decimal_separator' => $this->decimal_separator,
-            'swap_currency_symbol' => $this->swap_currency_symbol,
-            'exchange_rate' => $this->exchange_rate
-        ];
-    }
-}

app/Http/Resources/Customer/CustomFieldCollection.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace Crater\Http\Resources\Customer;
-
-use Illuminate\Http\Resources\Json\ResourceCollection;
-
-class CustomFieldCollection extends ResourceCollection
-{
-    /**
-     * Transform the resource collection into an array.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        return parent::toArray($request);
-    }
-}

app/Http/Resources/Customer/CustomFieldResource.php

@@ -1,42 +0,0 @@
-<?php
-
-namespace Crater\Http\Resources\Customer;
-
-use Illuminate\Http\Resources\Json\JsonResource;
-
-class CustomFieldResource 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,
-            'slug' => $this->slug,
-            'label' => $this->label,
-            'model_type' => $this->model_type,
-            'type' => $this->type,
-            'placeholder' => $this->placeholder,
-            'options' => $this->options,
-            'boolean_answer' => $this->boolean_answer,
-            'date_answer' => $this->date_answer,
-            'time_answer' => $this->time_answer,
-            'string_answer' => $this->string_answer,
-            'number_answer' => $this->number_answer,
-            'date_time_answer' => $this->date_time_answer,
-            'is_required' => $this->is_required,
-            'in_use' => $this->in_use,
-            'order' => $this->order,
-            'company_id' => $this->company_id,
-            'default_answer' => $this->default_answer,
-            'company' => $this->when($this->company()->exists(), function () {
-                return new CompanyResource($this->company);
-            }),
-        ];
-    }
-}

app/Http/Resources/Customer/CustomFieldValueCollection.php

@@ -1,19 +0,0 @@
-<?php
-
-namespace Crater\Http\Resources\Customer;
-
-use Illuminate\Http\Resources\Json\ResourceCollection;
-
-class CustomFieldValueCollection extends ResourceCollection
-{
-    /**
-     * Transform the resource collection into an array.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        return parent::toArray($request);
-    }
-}

app/Http/Resources/Customer/CustomFieldValueResource.php

@@ -1,39 +0,0 @@
-<?php
-
-namespace Crater\Http\Resources\Customer;
-
-use Illuminate\Http\Resources\Json\JsonResource;
-
-class CustomFieldValueResource extends JsonResource
-{
-    /**
-     * Transform the resource into an array.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        return [
-            'id' => $this->id,
-            'custom_field_valuable_type' => $this->custom_field_valuable_type,
-            'custom_field_valuable_id' => $this->custom_field_valuable_id,
-            'type' => $this->type,
-            'boolean_answer' => $this->boolean_answer,
-            'date_answer' => $this->date_answer,
-            'time_answer' => $this->time_answer,
-            'string_answer' => $this->string_answer,
-            'number_answer' => $this->number_answer,
-            'date_time_answer' => $this->date_time_answer,
-            'custom_field_id' => $this->custom_field_id,
-            'company_id' => $this->company_id,
-            'default_answer' => $this->defaultAnswer,
-            'custom_field' => $this->when($this->customField()->exists(), function () {
-                return new CustomFieldResource($this->customField);
-            }),
-            'company' => $this->when($this->company()->exists(), function () {
-                return new CompanyResource($this->company);
-            }),
-        ];
-    }
-}