v6 update

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

@@ -83,6 +83,8 @@ 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,6 +21,9 @@ class SendEstimatePreviewController extends Controller
 
         $markdown = new Markdown(view(), config('mail.markdown'));
 
-        return $markdown->render('emails.send.estimate', ['data' => $estimate->sendEstimateData($request->all())]);
+        $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  \Illuminate\Http\Request $request
+     * @param  \Crater\Http\Requests\ExpenseRequest $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  \Illuminate\Http\Request $request
+     * @param  \Crater\Http\Requests\ExpenseRequest $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\ExpenseRequest;
 use Crater\Models\Expense;
-use Illuminate\Http\Request;
 
 class UploadReceiptController extends Controller
 {
     /**
      * Upload the expense receipts to storage.
      *
-     * @param  \Illuminate\Http\Request $request
+     * @param  \Crater\Http\Requests\ExpenseRequest $request
      * @param  Expense $expense
      * @return \Illuminate\Http\JsonResponse
      */
-    public function __invoke(Request $request, Expense $expense)
+    public function __invoke(ExpenseRequest $request, Expense $expense)
     {
         $this->authorize('update', $expense);
 

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

@@ -8,6 +8,8 @@ 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;
@@ -47,6 +49,8 @@ class BootstrapController extends Controller
 
         BouncerFacade::refreshFor($current_user);
 
+        $global_settings = Setting::getSettings(['api_token', 'admin_portal_theme']);
+
         return response()->json([
             'current_user' => new UserResource($current_user),
             'current_user_settings' => $current_user_settings,
@@ -56,8 +60,10 @@ 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,6 +20,7 @@ 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,6 +76,8 @@ 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/SendInvoicePreviewController.php

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

@@ -0,0 +1,25 @@
+<?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

@@ -0,0 +1,27 @@
+<?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

@@ -0,0 +1,27 @@
+<?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

@@ -0,0 +1,32 @@
+<?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

@@ -0,0 +1,25 @@
+<?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

@@ -0,0 +1,32 @@
+<?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

@@ -0,0 +1,33 @@
+<?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

@@ -0,0 +1,25 @@
+<?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

@@ -0,0 +1,28 @@
+<?php
+
+namespace Crater\Http\Controllers\V1\Admin\Modules;
+
+use Crater\Http\Controllers\Controller;
+use Crater\Space\ModuleInstaller;
+use Illuminate\Http\Request;
+
+class UnzipModuleController extends Controller
+{
+    /**
+     * Handle the incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function __invoke(Request $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

@@ -0,0 +1,25 @@
+<?php
+
+namespace Crater\Http\Controllers\V1\Admin\Modules;
+
+use Crater\Http\Controllers\Controller;
+use Crater\Space\ModuleInstaller;
+use Illuminate\Http\Request;
+
+class UploadModuleController 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::upload($request);
+
+        return response()->json($response);
+    }
+}

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

@@ -22,6 +22,7 @@ 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);
@@ -68,7 +69,7 @@ class PaymentMethodsController extends Controller
     {
         $this->authorize('update', $paymentMethod);
 
-        $paymentMethod->update($request->validated());
+        $paymentMethod->update($request->getPaymentMethodPayload());
 
         return new PaymentMethodResource($paymentMethod);
     }

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

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

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

@@ -3,6 +3,8 @@
 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;
@@ -48,7 +50,7 @@ class CompanyController extends Controller
 
         $this->authorize('manage company', $company);
 
-        $company->update($request->only('name'));
+        $company->update($request->getCompanyPayload());
 
         $company->address()->updateOrCreate(['company_id' => $company->id], $request->address);
 
@@ -58,10 +60,10 @@ class CompanyController extends Controller
     /**
      * Upload the company logo to storage.
      *
-     * @param  \Illuminate\Http\Request $request
+     * @param  \Crater\Http\Requests\CompanyLogoRequest $request
      * @return \Illuminate\Http\JsonResponse
      */
-    public function uploadCompanyLogo(Request $request)
+    public function uploadCompanyLogo(CompanyLogoRequest $request)
     {
         $company = Company::find($request->header('company'));
 
@@ -89,10 +91,10 @@ class CompanyController extends Controller
     /**
      * Upload the Admin Avatar to public storage.
      *
-     * @param  \Illuminate\Http\Request $request
+     * @param  \Crater\Http\Requests\AvatarRequest $request
      * @return \Illuminate\Http\JsonResponse
      */
-    public function uploadAvatar(Request $request)
+    public function uploadAvatar(AvatarRequest $request)
     {
         $user = auth()->user();
 

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

@@ -0,0 +1,28 @@
+<?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,6 +22,7 @@ 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/UpdateSettingsController.php

@@ -0,0 +1,29 @@
+<?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
+        ]);
+    }
+}