%s: %s', $this->signature_base64, trans('texts.signed'), Utils::fromSqlDateTime($this->signature_date));
+ }
}
Invitation::creating(function ($invitation)
diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php
index 90d58f749b53..7856c8cc923c 100644
--- a/app/Models/Invoice.php
+++ b/app/Models/Invoice.php
@@ -841,6 +841,14 @@ class Invoice extends EntityModel implements BalanceAffecting
return $this->invoice_status_id >= INVOICE_STATUS_VIEWED;
}
+ /**
+ * @return bool
+ */
+ public function isApproved()
+ {
+ return $this->invoice_status_id >= INVOICE_STATUS_APPROVED;
+ }
+
/**
* @return bool
*/
diff --git a/app/Models/Traits/Inviteable.php b/app/Models/Traits/Inviteable.php
index 825755a4936d..28344c4338da 100644
--- a/app/Models/Traits/Inviteable.php
+++ b/app/Models/Traits/Inviteable.php
@@ -106,13 +106,4 @@ trait Inviteable
$client->markLoggedIn();
}
}
-
- public function signatureDiv()
- {
- if (! $this->signature_base64) {
- return false;
- }
-
- return sprintf('%s: %s', $this->signature_base64, trans('texts.signed'), Utils::fromSqlDateTime($this->signature_date));
- }
}
diff --git a/app/Ninja/Datatables/ProposalDatatable.php b/app/Ninja/Datatables/ProposalDatatable.php
index 7a8b9f7fd651..00f2b18bacc1 100644
--- a/app/Ninja/Datatables/ProposalDatatable.php
+++ b/app/Ninja/Datatables/ProposalDatatable.php
@@ -28,10 +28,10 @@ class ProposalDatatable extends EntityDatatable
'template',
function ($model) {
if (! Auth::user()->can('viewByOwner', [ENTITY_PROPOSAL_TEMPLATE, $model->template_user_id])) {
- return $model->template;
+ return $model->template ?: ' ';
}
- return link_to("proposals/templates/{$model->template_public_id}/edit", $model->template)->toHtml();
+ return link_to("proposals/templates/{$model->template_public_id}/edit", $model->template ?: ' ')->toHtml();
},
],
[
diff --git a/app/Ninja/Repositories/ProposalRepository.php b/app/Ninja/Repositories/ProposalRepository.php
index 416a2f271c3a..3d3b18a6ab98 100644
--- a/app/Ninja/Repositories/ProposalRepository.php
+++ b/app/Ninja/Repositories/ProposalRepository.php
@@ -120,4 +120,39 @@ class ProposalRepository extends BaseRepository
return $proposal;
}
+
+ /**
+ * @param $invitationKey
+ *
+ * @return Invitation|bool
+ */
+ public function findInvitationByKey($invitationKey)
+ {
+ // check for extra params at end of value (from website feature)
+ list($invitationKey) = explode('&', $invitationKey);
+ $invitationKey = substr($invitationKey, 0, RANDOM_KEY_LENGTH);
+
+ /** @var \App\Models\Invitation $invitation */
+ $invitation = ProposalInvitation::where('invitation_key', '=', $invitationKey)->first();
+ if (! $invitation) {
+ return false;
+ }
+
+ $proposal = $invitation->proposal;
+ if (! $proposal || $proposal->is_deleted) {
+ return false;
+ }
+
+ $invoice = $proposal->invoice;
+ if (! $invoice || $invoice->is_deleted) {
+ return false;
+ }
+
+ $client = $invoice->client;
+ if (! $client || $client->is_deleted) {
+ return false;
+ }
+
+ return $invitation;
+ }
}
diff --git a/database/migrations/2018_01_10_073825_add_subscription_format.php b/database/migrations/2018_01_10_073825_add_subscription_format.php
index e873142d9cd3..7404894f9a3d 100644
--- a/database/migrations/2018_01_10_073825_add_subscription_format.php
+++ b/database/migrations/2018_01_10_073825_add_subscription_format.php
@@ -116,6 +116,9 @@ class AddSubscriptionFormat extends Migration
$table->timestamp('sent_date')->nullable();
$table->timestamp('viewed_date')->nullable();
+ $table->timestamp('opened_date')->nullable();
+ $table->string('message_id')->nullable();
+ $table->text('email_error')->nullable();
$table->foreign('user_id')->references('id')->on('users')->onDelete('cascade');
$table->foreign('contact_id')->references('id')->on('contacts')->onDelete('cascade');
diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php
index 0f7a3837a4d5..5ed1757e0f7d 100644
--- a/resources/lang/en/texts.php
+++ b/resources/lang/en/texts.php
@@ -794,7 +794,7 @@ $LANG = array(
'default_invoice_footer' => 'Default Invoice Footer',
'quote_footer' => 'Quote Footer',
'free' => 'Free',
- 'quote_is_approved' => 'The quote has been approved',
+ 'quote_is_approved' => 'Successfully approved',
'apply_credit' => 'Apply Credit',
'system_settings' => 'System Settings',
'archive_token' => 'Archive Token',
@@ -2725,6 +2725,7 @@ $LANG = array(
'delete_status' => 'Delete Status',
'standard' => 'Standard',
'icon' => 'Icon',
+ 'proposal_not_found' => 'The requested proposal is not available',
);
diff --git a/resources/views/invited/proposal.blade.php b/resources/views/invited/proposal.blade.php
new file mode 100644
index 000000000000..4bd3f1bc709a
--- /dev/null
+++ b/resources/views/invited/proposal.blade.php
@@ -0,0 +1,38 @@
+@extends('public.header')
+
+@section('content')
+
+