v6 update

.env.example

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

.gitignore

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

app/Console/Commands/InstallModuleCommand.php

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

@@ -16,7 +16,8 @@ class Kernel extends ConsoleKernel
     protected $commands = [
         Commands\ResetApp::class,
         Commands\UpdateCommand::class,
-        Commands\CreateTemplateCommand::class
+        Commands\CreateTemplateCommand::class,
+        Commands\InstallModuleCommand::class,
     ];
 
     /**

app/Events/ModuleDisabledEvent.php

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

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

@@ -0,0 +1,26 @@
+<?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/Estimate/ConvertEstimateController.php

@@ -83,6 +83,8 @@ public function __invoke(Request $request, Estimate $estimate, Invoice $invoice)
             '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 @@ public function __invoke(SendEstimatesRequest $request, Estimate $estimate)
 
         $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 @@ public function index(Request $request)
     /**
      * 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 @@ public function show(Expense $expense)
     /**
      * 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\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 @@ public function __invoke(Request $request)
 
         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 @@ public function __invoke(Request $request)
             '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 @@ public function __invoke(Request $request)
         $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 @@ public function __invoke(Request $request, Invoice $invoice)
             '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 @@ public function __invoke(SendInvoiceRequest $request, Invoice $invoice)
 
         $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]);
+    }
+}