@@ -136,8 +131,7 @@ class Modern
';
}
- public function footer()
- {
+ public function footer() {
return '
diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php
index 1bc5af2bb596..9b38e73b88a7 100644
--- a/app/Http/Controllers/InvoiceController.php
+++ b/app/Http/Controllers/InvoiceController.php
@@ -28,10 +28,13 @@ use App\Jobs\Invoice\CreateInvoicePdf;
use App\Jobs\Invoice\EmailInvoice;
use App\Jobs\Invoice\StoreInvoice;
use App\Models\Invoice;
+use App\Models\InvoiceInvitation;
use App\Repositories\InvoiceRepository;
use App\Transformers\InvoiceTransformer;
use App\Utils\Traits\MakesHash;
use Illuminate\Http\Request;
+use Illuminate\Support\Facades\File;
+use Illuminate\Support\Facades\Storage;
/**
* Class InvoiceController
@@ -57,9 +60,11 @@ class InvoiceController extends BaseController {
* @param \App\Repositories\InvoiceRepository $invoice_repo The invoice repo
*/
public function __construct(InvoiceRepository $invoice_repo) {
+
parent::__construct();
$this->invoice_repo = $invoice_repo;
+
}
/**
@@ -75,8 +80,8 @@ class InvoiceController extends BaseController {
* tags={"invoices"},
* summary="Gets a list of invoices",
* description="Lists invoices, search and filters allow fine grained lists to be generated.
-
- Query parameters can be added to performed more fine grained filtering of the invoices, these are handled by the InvoiceFilters class which defines the methods available",
+ *
+ * Query parameters can be added to performed more fine grained filtering of the invoices, these are handled by the InvoiceFilters class which defines the methods available",
* @OA\Parameter(ref="#/components/parameters/X-Api-Secret"),
* @OA\Parameter(ref="#/components/parameters/X-Api-Token"),
* @OA\Parameter(ref="#/components/parameters/X-Requested-With"),
@@ -519,17 +524,17 @@ class InvoiceController extends BaseController {
* tags={"invoices"},
* summary="Performs a custom action on an invoice",
* description="Performs a custom action on an invoice.
-
- The current range of actions are as follows
- - clone_to_invoice
- - clone_to_quote
- - history
- - delivery_note
- - mark_paid
- - download
- - archive
- - delete
- - email",
+ *
+ * The current range of actions are as follows
+ * - clone_to_invoice
+ * - clone_to_quote
+ * - history
+ * - delivery_note
+ * - mark_paid
+ * - download
+ * - archive
+ * - delete
+ * - email",
* @OA\Parameter(ref="#/components/parameters/X-Api-Secret"),
* @OA\Parameter(ref="#/components/parameters/X-Api-Token"),
* @OA\Parameter(ref="#/components/parameters/X-Requested-With"),
@@ -649,11 +654,11 @@ class InvoiceController extends BaseController {
public function downloadPdf($invitation_key) {
- $invitation = InvoiceInvitation::whereKey($invitation_key)->company()->first();
+ $invitation = $this->invoice_repo->getInvitationByKey($invitation_key);
$contact = $invitation->contact;
$invoice = $invitation->invoice;
- $file_path = CreateInvoicePdf::dispatchNow($invoice, $invoice->company, $contact);
+ $file_path = $invoice->service()->getInvoicePdf(); //CreateInvoicePdf::dispatchNow($invoice, $invoice->company, $contact);
return response()->download($file_path);
diff --git a/app/Jobs/Invoice/CreateInvoicePdf.php b/app/Jobs/Invoice/CreateInvoicePdf.php
index 4891f64aacd7..a153988424e9 100644
--- a/app/Jobs/Invoice/CreateInvoicePdf.php
+++ b/app/Jobs/Invoice/CreateInvoicePdf.php
@@ -39,27 +39,35 @@ class CreateInvoicePdf implements ShouldQueue {
public $company;
public $contact;
+
+ private $disk;
/**
* Create a new job instance.
*
* @return void
*/
- public function __construct(Invoice $invoice, Company $company, ClientContact $contact) {
+ public function __construct(Invoice $invoice, Company $company, ClientContact $contact, $disk = 'public')
+ {
+
$this->invoice = $invoice;
$this->company = $company;
$this->contact = $contact;
+
+ $this->disk = $disk ?? config('filesystems.default');
+
}
public function handle() {
+
MultiDB::setDB($this->company->db);
App::setLocale($this->contact->preferredLocale());
$this->invoice->load('client');
- $path = 'public/'.$this->invoice->client->client_hash.'/invoices/';
- $file_path = $path.$this->invoice->number.'.pdf';
+ $path = $this->invoice->client->client_hash . '/invoices/';
+ $file_path = $path . $this->invoice->number . '.pdf';
$modern = new Modern();
$designer = new Designer($modern, $this->invoice->client->getSetting('invoice_variables'));
@@ -74,9 +82,14 @@ class CreateInvoicePdf implements ShouldQueue {
//create pdf
$pdf = $this->makePdf(null, null, $html);
- $path = Storage::put($file_path, $pdf);
+ $instance = Storage::disk($this->disk)->put($file_path, $pdf);
+
+ \Log::error($instance);
- return $path;
+ //$instance = Storage::disk($this->disk)->putFileAs($path, $pdf, $this->invoice->number . '.pdf');
+ //$instance = Storage::putFileAs($path, $pdf, $this->invoice->number . '.pdf');
+
+ return $instance;
}
/**
diff --git a/app/Jobs/Invoice/InvoiceNotification.php b/app/Jobs/Invoice/InvoiceNotification.php
index dd311090376e..5f4ab1fcd62e 100644
--- a/app/Jobs/Invoice/InvoiceNotification.php
+++ b/app/Jobs/Invoice/InvoiceNotification.php
@@ -12,40 +12,37 @@
namespace App\Jobs\Invoice;
use App\Models\Invoice;
-use App\Repositories\InvoiceRepository;
+
use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\SerializesModels;
-class InvoiceNotification implements ShouldQueue
-{
- use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+class InvoiceNotification implements ShouldQueue {
+ use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
- public $invoice;
+ public $invoice;
- /**
- * Create a new job instance.
- *
- * @return void
- */
- public function __construct(Invoice $invoice)
- {
- $this->invoice = $invoice;
- }
+ /**
+ * Create a new job instance.
+ *
+ * @return void
+ */
+ public function __construct(Invoice $invoice) {
+ $this->invoice = $invoice;
+ }
- /**
- * Execute the job.
- *
- *
- * @return void
- */
- public function handle()
- {
+ /**
+ * Execute the job.
+ *
+ *
+ * @return void
+ */
+ public function handle() {
- //notification for the invoice.
- //
- //could mean a email, sms, slack, push
- }
+ //notification for the invoice.
+ //
+ //could mean a email, sms, slack, push
+ }
}
diff --git a/app/Jobs/Util/UploadFile.php b/app/Jobs/Util/UploadFile.php
index 729dc1e383ff..7014f039daa5 100644
--- a/app/Jobs/Util/UploadFile.php
+++ b/app/Jobs/Util/UploadFile.php
@@ -47,7 +47,7 @@ class UploadFile implements ShouldQueue
public $entity;
- public function __construct($file, $type, $user, $company, $entity, $disk = 'local')
+ public function __construct($file, $type, $user, $company, $entity, $disk = 'public')
{
$this->file = $file;
$this->type = $type;
diff --git a/app/Models/Design.php b/app/Models/Design.php
new file mode 100644
index 000000000000..efcf1ace236b
--- /dev/null
+++ b/app/Models/Design.php
@@ -0,0 +1,25 @@
+belongsTo(Company::class);
+ }
+
+}
\ No newline at end of file
diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php
index dce27036dcc9..ad98b2239741 100644
--- a/app/Models/Invoice.php
+++ b/app/Models/Invoice.php
@@ -342,9 +342,14 @@ class Invoice extends BaseModel
/** TODO// DOCUMENT THIS FUNCTIONALITY */
public function pdf_url()
{
- $public_path = 'storage/' . $this->client->client_hash . '/invoices/'. $this->number . '.pdf';
+ // $public_path = 'storage/' . $this->client->client_hash . '/invoices/'. $this->number . '.pdf';
+
+ // $storage_path = 'public/' . $this->client->client_hash . '/invoices/'. $this->number . '.pdf';
+
+ $public_path = $this->client->client_hash . '/invoices/'. $this->number . '.pdf';
+
+ $storage_path = $this->client->client_hash . '/invoices/'. $this->number . '.pdf';
- $storage_path = 'public/' . $this->client->client_hash . '/invoices/'. $this->number . '.pdf';
if (!Storage::exists($storage_path)) {
event(new InvoiceWasUpdated($this, $this->company));
diff --git a/app/Repositories/InvoiceRepository.php b/app/Repositories/InvoiceRepository.php
index 120d56885386..d14374fc50e8 100644
--- a/app/Repositories/InvoiceRepository.php
+++ b/app/Repositories/InvoiceRepository.php
@@ -131,4 +131,9 @@ class InvoiceRepository extends BaseRepository {
public function markSent(Invoice $invoice):?Invoice {
return $invoice->service()->markSent()->save();
}
+
+ public function getInvitationByKey($key)
+ {
+ return InvoiceInvitation::whereRaw("BINARY `key`= ?", [$key])->first();
+ }
}
diff --git a/app/Services/Invoice/GetInvoicePdf.php b/app/Services/Invoice/GetInvoicePdf.php
new file mode 100644
index 000000000000..abc17839e941
--- /dev/null
+++ b/app/Services/Invoice/GetInvoicePdf.php
@@ -0,0 +1,52 @@
+client->client_hash . '/invoices/';
+
+ $file_path = $path . $invoice->number . '.pdf';
+
+ $disk = config('filesystems.default');
+
+ $file = Storage::disk($disk)->exists($file_path);
+
+ if(!$contact)
+ $contact = $invoice->client->primary_contact()->first();
+
+ if(!$file)
+ {
+
+ $file_path = CreateInvoicePdf::dispatchNow($invoice, $invoice->company, $contact);
+
+ }
+
+ //return $file_path;
+
+ return Storage::disk($disk)->path($file_path);
+
+ }
+
+}
+
diff --git a/app/Services/Invoice/InvoiceService.php b/app/Services/Invoice/InvoiceService.php
index c61e7494e978..3c7cc35e79dd 100644
--- a/app/Services/Invoice/InvoiceService.php
+++ b/app/Services/Invoice/InvoiceService.php
@@ -17,6 +17,7 @@ use App\Services\Client\ClientService;
use App\Services\Invoice\ApplyNumber;
use App\Services\Invoice\ApplyPayment;
use App\Services\Invoice\CreateInvitations;
+use App\Services\Invoice\GetInvoicePdf;
use App\Services\Invoice\MarkInvoicePaid;
use App\Services\Invoice\MarkSent;
use App\Services\Invoice\UpdateBalance;
@@ -112,6 +113,22 @@ class InvoiceService
return $this;
}
+ public function getInvoicePdf()
+ {
+ $get_invoice_pdf = new GetInvoicePdf();
+
+ return $get_invoice_pdf($this->invoice);
+ }
+
+
+
+
+
+
+
+
+
+
public function markViewed()
{
$this->invoice->last_viewed = Carbon::now()->format('Y-m-d H:i');
@@ -159,7 +176,6 @@ class InvoiceService
-
/**
* Saves the invoice
* @return Invoice object
diff --git a/app/Utils/Traits/MakesHash.php b/app/Utils/Traits/MakesHash.php
index f836681d2800..2fa114d66420 100644
--- a/app/Utils/Traits/MakesHash.php
+++ b/app/Utils/Traits/MakesHash.php
@@ -11,6 +11,7 @@
namespace App\Utils\Traits;
+use App\Exceptions\ModelNotFoundException;
use App\Libraries\MultiDB;
use Hashids\Hashids;
@@ -69,6 +70,9 @@ trait MakesHash
// \Log::error($decoded_array);
+ if(!is_array($decoded_array))
+ throw new ModelNotFoundException("Resource not found", 1);
+
return $decoded_array[0];
} catch (\Exception $e) {
return response()->json(['error'=>'Invalid primary key'], 400);
diff --git a/config/filesystems.php b/config/filesystems.php
index 88bcf3da5fb7..77225298c38a 100644
--- a/config/filesystems.php
+++ b/config/filesystems.php
@@ -13,7 +13,7 @@ return [
|
*/
- 'default' => env('FILESYSTEM_DRIVER', 'local'),
+ 'default' => env('FILESYSTEM_DRIVER', 'public'),
/*
|--------------------------------------------------------------------------
diff --git a/database/migrations/2014_10_13_000000_create_users_table.php b/database/migrations/2014_10_13_000000_create_users_table.php
index c2c7a01a68d2..5eb1ba0cd3a2 100644
--- a/database/migrations/2014_10_13_000000_create_users_table.php
+++ b/database/migrations/2014_10_13_000000_create_users_table.php
@@ -1353,6 +1353,20 @@ class CreateUsersTable extends Migration
$table->foreign('client_id')->references('id')->on('clients')->onDelete('cascade')->onUpdate('cascade');
});
+
+ Schema::create('designs', function ($table) {
+ $table->increments('id');
+ $table->unsignedInteger('user_id')->nullable();
+ $table->unsignedInteger('company_id')->nullable()->index();
+ $table->string('name');
+ $table->boolean('is_custom')->default(true);
+ $table->boolean('is_active')->default(true);
+ $table->mediumText('design')->nullable();
+ $table->timestamps(6);
+
+ $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade')->onUpdate('cascade');
+
+ });
}
/**
diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php
index 53f70223c680..111378d9d7ff 100644
--- a/database/seeds/DatabaseSeeder.php
+++ b/database/seeds/DatabaseSeeder.php
@@ -31,6 +31,7 @@ class DatabaseSeeder extends Seeder
$this->call('PaymentTypesSeeder');
$this->call('GatewayTypesSeeder');
$this->call('DateFormatsSeeder');
+ $this->call('DesignSeeder');
}
}
diff --git a/database/seeds/DesignSeeder.php b/database/seeds/DesignSeeder.php
new file mode 100644
index 000000000000..e9737a3eab25
--- /dev/null
+++ b/database/seeds/DesignSeeder.php
@@ -0,0 +1,40 @@
+createDesigns();
+ }
+
+ private function createDesigns()
+ {
+ $designs = [
+ ['id' => 1, 'name' => 'Plain', 'user_id' => null, 'company_id' => null, 'is_custom' => false, 'design' => '', 'is_active' => true],
+ ['id' => 2, 'name' => 'Clean', 'user_id' => null, 'company_id' => null, 'is_custom' => false, 'design' => '', 'is_active' => true],
+ ['id' => 3, 'name' => 'Bold', 'user_id' => null, 'company_id' => null, 'is_custom' => false, 'design' => '', 'is_active' => true],
+ ['id' => 4, 'name' => 'Modern', 'user_id' => null, 'company_id' => null, 'is_custom' => false, 'design' => '', 'is_active' => true],
+ ['id' => 5, 'name' => 'Business', 'user_id' => null, 'company_id' => null, 'is_custom' => false, 'design' => '', 'is_active' => true],
+ ['id' => 6, 'name' => 'Creative', 'user_id' => null, 'company_id' => null, 'is_custom' => false, 'design' => '', 'is_active' => true],
+ ['id' => 7, 'name' => 'Elegant', 'user_id' => null, 'company_id' => null, 'is_custom' => false, 'design' => '', 'is_active' => true],
+ ['id' => 8, 'name' => 'Hipster', 'user_id' => null, 'company_id' => null, 'is_custom' => false, 'design' => '', 'is_active' => true],
+ ['id' => 9, 'name' => 'Playful', 'user_id' => null, 'company_id' => null, 'is_custom' => false, 'design' => '', 'is_active' => true],
+ ['id' => 10, 'name' => 'Photo', 'user_id' => null, 'company_id' => null, 'is_custom' => false, 'design' => '', 'is_active' => true],
+ ];
+
+ foreach($designs as $design) {
+
+ $d = Design::find($design['id']);
+
+ if(!$d)
+ Design::create($design);
+ }
+
+ }
+}
\ No newline at end of file
diff --git a/tests/Integration/InvoiceUploadTest.php b/tests/Integration/InvoiceUploadTest.php
new file mode 100644
index 000000000000..58fe24fd8bac
--- /dev/null
+++ b/tests/Integration/InvoiceUploadTest.php
@@ -0,0 +1,39 @@
+makeTestData();
+ }
+
+ public function testInvoiceUploadWorks()
+ {
+
+ CreateInvoicePdf::dispatchNow($this->invoice, $this->invoice->company, $this->invoice->client->primary_contact()->first());
+
+ $this->assertNotNull($this->invoice->service()->getInvoicePdf());
+
+ }
+
+
+}
\ No newline at end of file
diff --git a/tests/Integration/UploadFileTest.php b/tests/Integration/UploadFileTest.php
index 3840aa4f8166..2a22af5f00bc 100644
--- a/tests/Integration/UploadFileTest.php
+++ b/tests/Integration/UploadFileTest.php
@@ -19,6 +19,7 @@ use Illuminate\Foundation\Testing\DatabaseTransactions;
use Illuminate\Http\UploadedFile;
use Illuminate\Routing\Middleware\ThrottleRequests;
use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Storage;
use Tests\MockAccountData;
use Tests\TestCase;
@@ -50,7 +51,7 @@ class UploadFileTest extends TestCase
$document = UploadFile::dispatchNow(
$image, UploadFile::IMAGE, $this->invoice->user, $this->invoice->company, $this->invoice
);
-
+
$this->assertNotNull($document);
}