diff --git a/app/Console/Commands/CheckData.php b/app/Console/Commands/CheckData.php index 64c8dd00db..a5c5fe6a53 100644 --- a/app/Console/Commands/CheckData.php +++ b/app/Console/Commands/CheckData.php @@ -46,29 +46,78 @@ class CheckData extends Command { public function fire() { $this->info(date('Y-m-d') . ' Running CheckData...'); - $today = new DateTime(); if (!$this->option('client_id')) { - // update client paid_to_date value - $clients = DB::table('clients') - ->join('payments', 'payments.client_id', '=', 'clients.id') - ->join('invoices', 'invoices.id', '=', 'payments.invoice_id') - ->where('payments.is_deleted', '=', 0) - ->where('invoices.is_deleted', '=', 0) - ->groupBy('clients.id') - ->havingRaw('clients.paid_to_date != sum(payments.amount) and clients.paid_to_date != 999999999.9999') - ->get(['clients.id', 'clients.paid_to_date', DB::raw('sum(payments.amount) as amount')]); - $this->info(count($clients) . ' clients with incorrect paid to date'); + $this->checkPaidToDate(); + } + + $this->checkBalances(); + + $this->checkActivityAccount(); + + $this->info('Done'); + } + + private function checkActivityAccount() + { + $entityTypes = [ + ENTITY_INVOICE, + ENTITY_CLIENT, + ENTITY_CONTACT, + ENTITY_PAYMENT, + ENTITY_INVITATION, + ]; + + foreach ($entityTypes as $entityType) { + $activities = DB::table('activities') + ->join("{$entityType}s", "{$entityType}s.id", '=', "activities.{$entityType}_id"); + + if ($entityType != ENTITY_CLIENT) { + $activities = $activities->join('clients', 'clients.id', '=', 'activities.client_id'); + } + $activities = $activities->where('activities.account_id', '!=', DB::raw("{$entityType}s.account_id")) + ->get(['activities.id', "clients.account_id", "clients.user_id"]); + + $this->info(count($activities) . " {$entityType} activity with incorrect account id"); + if ($this->option('fix') == 'true') { - foreach ($clients as $client) { - DB::table('clients') - ->where('id', $client->id) - ->update(['paid_to_date' => $client->amount]); + foreach ($activities as $activity) { + DB::table('activities') + ->where('id', $activity->id) + ->update([ + 'account_id' => $activity->account_id, + 'user_id' => $activity->user_id, + ]); } } } + } + private function checkPaidToDate() + { + // update client paid_to_date value + $clients = DB::table('clients') + ->join('payments', 'payments.client_id', '=', 'clients.id') + ->join('invoices', 'invoices.id', '=', 'payments.invoice_id') + ->where('payments.is_deleted', '=', 0) + ->where('invoices.is_deleted', '=', 0) + ->groupBy('clients.id') + ->havingRaw('clients.paid_to_date != sum(payments.amount) and clients.paid_to_date != 999999999.9999') + ->get(['clients.id', 'clients.paid_to_date', DB::raw('sum(payments.amount) as amount')]); + $this->info(count($clients) . ' clients with incorrect paid to date'); + + if ($this->option('fix') == 'true') { + foreach ($clients as $client) { + DB::table('clients') + ->where('id', $client->id) + ->update(['paid_to_date' => $client->amount]); + } + } + } + + private function checkBalances() + { // find all clients where the balance doesn't equal the sum of the outstanding invoices $clients = DB::table('clients') ->join('invoices', 'invoices.client_id', '=', 'clients.id') @@ -249,8 +298,6 @@ class CheckData extends Command { ->update($data); } } - - $this->info('Done'); } protected function getArguments() diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index d7722136d2..1146fe4fc9 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -432,6 +432,11 @@ class AccountController extends BaseController { if (Auth::user()->account->isPro()) { $account = Auth::user()->account; + $account->email_design_id = Input::get('email_design_id'); + + if (Utils::isNinja()) { + $account->enable_email_markup = Input::get('enable_email_markup') ? true : false; + } foreach ([ENTITY_INVOICE, ENTITY_QUOTE, ENTITY_PAYMENT, REMINDER1, REMINDER2, REMINDER3] as $type) { $subjectField = "email_subject_{$type}"; diff --git a/app/Http/routes.php b/app/Http/routes.php index eed6098281..738ef1e4aa 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -253,6 +253,7 @@ if (!defined('CONTACT_EMAIL')) { define('ENTITY_CONTACT', 'contact'); define('ENTITY_INVOICE', 'invoice'); define('ENTITY_INVOICE_ITEMS', 'invoice_items'); + define('ENTITY_INVITATION', 'invitation'); define('ENTITY_RECURRING_INVOICE', 'recurring_invoice'); define('ENTITY_PAYMENT', 'payment'); define('ENTITY_CREDIT', 'credit'); @@ -446,6 +447,7 @@ if (!defined('CONTACT_EMAIL')) { define('PHANTOMJS_CLOUD', 'http://api.phantomjscloud.com/api/browser/v2/'); define('PHP_DATE_FORMATS', 'http://php.net/manual/en/function.date.php'); define('REFERRAL_PROGRAM_URL', 'https://www.invoiceninja.com/referral-program/'); + define('EMAIL_MARKUP_URL', 'https://developers.google.com/gmail/markup/overview'); define('COUNT_FREE_DESIGNS', 4); define('COUNT_FREE_DESIGNS_SELF_HOST', 5); // include the custom design @@ -498,6 +500,9 @@ if (!defined('CONTACT_EMAIL')) { define('API_SERIALIZER_ARRAY', 'array'); define('API_SERIALIZER_JSON', 'json'); + define('EMAIL_DESIGN_PLAIN', 1); + define('FLAT_BUTTON_CSS', 'border:0 none;border-radius:6px;padding:12px 40px;margin:0 6px;cursor:hand;display:inline-block;font-size:14px;color:#fff;text-transform:none'); + $creditCards = [ 1 => ['card' => 'images/credit_cards/Test-Visa-Icon.png', 'text' => 'Visa'], 2 => ['card' => 'images/credit_cards/Test-MasterCard-Icon.png', 'text' => 'Master Card'], @@ -522,7 +527,6 @@ if (!defined('CONTACT_EMAIL')) { 'invoiceStatus' => 'App\Models\InvoiceStatus', 'frequencies' => 'App\Models\Frequency', 'gateways' => 'App\Models\Gateway', - 'themes' => 'App\Models\Theme', ]; define('CACHED_TABLES', serialize($cachedTables)); diff --git a/app/Libraries/Utils.php b/app/Libraries/Utils.php index 4af034825d..4c061b8b81 100644 --- a/app/Libraries/Utils.php +++ b/app/Libraries/Utils.php @@ -279,9 +279,19 @@ class Utils return json_decode(json_encode((array) $data), true); } - public static function toSpaceCase($camelStr) + public static function toSpaceCase($string) { - return preg_replace('/([a-z])([A-Z])/s', '$1 $2', $camelStr); + return preg_replace('/([a-z])([A-Z])/s', '$1 $2', $string); + } + + public static function toSnakeCase($string) + { + return preg_replace('/([a-z])([A-Z])/s', '$1_$2', $string); + } + + public static function toCamelCase($string) + { + return lcfirst(str_replace(' ', '', ucwords(str_replace('_', ' ', $string)))); } public static function timestampToDateTimeString($timestamp) diff --git a/app/Models/Account.php b/app/Models/Account.php index 0842f36434..162b7c6501 100644 --- a/app/Models/Account.php +++ b/app/Models/Account.php @@ -5,6 +5,7 @@ use Utils; use Session; use DateTime; use Event; +use Cache; use App; use File; use App\Events\UserSettingsChanged; @@ -204,10 +205,26 @@ class Account extends Eloquent return $this->date_format ? $this->date_format->format : DEFAULT_DATE_FORMAT; } + public function formatMoney($amount, $client = null) + { + $currency = ($client && $client->currency) ? $client->currency : $this->currency; + + if ( ! $currency) { + $currencies = Cache::get('currencies')->filter(function($item) { + return $item->id == DEFAULT_CURRENCY; + }); + $currency = $currencies->first(); + } + + return $currency->symbol . number_format($amount, $currency->precision, $currency->decimal_separator, $currency->thousand_separator); + } + public function formatDate($date) { - if (!$date) { + if ( ! $date) { return null; + } elseif ( ! $date instanceof \DateTime) { + $date = new \DateTime($date); } return $date->format($this->getCustomDateFormat()); @@ -677,9 +694,9 @@ class Account extends Eloquent $entityType = ENTITY_INVOICE; } - $template = "
\$client,

" . - "
" . trans("texts.{$entityType}_message", ['amount' => '$amount']) . "

" . - "
\$link

"; + $template = "
\$client,

" . + "
" . trans("texts.{$entityType}_message", ['amount' => '$amount']) . "

" . + "
\$viewLink

"; if ($message) { $template .= "$message

\r\n\r\n"; @@ -693,13 +710,14 @@ class Account extends Eloquent if ($this->isPro()) { $field = "email_template_{$entityType}"; $template = $this->$field; - - if ($template) { - return $template; - } } - return $this->getDefaultEmailTemplate($entityType, $message); + if (!$template) { + $template = $this->getDefaultEmailTemplate($entityType, $message); + } + + //
is causing page breaks with the email designs + return str_replace('/>', ' />', $template); } public function getEmailFooter() @@ -708,7 +726,7 @@ class Account extends Eloquent // Add line breaks if HTML isn't already being used return strip_tags($this->email_footer) == $this->email_footer ? nl2br($this->email_footer) : $this->email_footer; } else { - return "

" . trans('texts.email_signature') . "\n
\$account

"; + return "

" . trans('texts.email_signature') . "\n
\$account"; } } diff --git a/app/Models/Gateway.php b/app/Models/Gateway.php index 55fc2056f4..da556dfb0e 100644 --- a/app/Models/Gateway.php +++ b/app/Models/Gateway.php @@ -2,6 +2,7 @@ use Eloquent; use Omnipay; +use Utils; class Gateway extends Eloquent { @@ -44,13 +45,20 @@ class Gateway extends Eloquent return $this->id == $gatewayId; } + public static function getPaymentTypeName($type) + { + return Utils::toCamelCase(strtolower(str_replace('PAYMENT_TYPE_', '', $type))); + } + + /* public static function getPaymentTypeLinks() { $data = []; foreach (self::$paymentTypes as $type) { - $data[] = strtolower(str_replace('PAYMENT_TYPE_', '', $type)); + $data[] = Utils::toCamelCase(strtolower(str_replace('PAYMENT_TYPE_', '', $type))); } return $data; } + */ public function getHelp() { diff --git a/app/Models/Invitation.php b/app/Models/Invitation.php index 16d5043499..2cc7102957 100644 --- a/app/Models/Invitation.php +++ b/app/Models/Invitation.php @@ -29,7 +29,7 @@ class Invitation extends EntityModel return $this->belongsTo('App\Models\Account'); } - public function getLink() + public function getLink($type = 'view') { if (!$this->account) { $this->load('account'); @@ -46,7 +46,7 @@ class Invitation extends EntityModel } } - return "{$url}/view/{$this->invitation_key}"; + return "{$url}/{$type}/{$this->invitation_key}"; } public function getStatus() diff --git a/app/Ninja/Mailers/ContactMailer.php b/app/Ninja/Mailers/ContactMailer.php index 67ba09a17d..3d9f473ce2 100644 --- a/app/Ninja/Mailers/ContactMailer.php +++ b/app/Ninja/Mailers/ContactMailer.php @@ -1,5 +1,6 @@ load('invitations', 'client.language', 'account'); @@ -97,6 +113,7 @@ class ContactMailer extends Mailer 'invoiceId' => $invoice->id, 'invitation' => $invitation, 'account' => $account, + 'client' => $client, 'invoice' => $invoice, ]; @@ -107,8 +124,14 @@ class ContactMailer extends Mailer $subject = $this->processVariables($subject, $variables); $fromEmail = $user->email; + + if ($account->email_design_id == EMAIL_DESIGN_PLAIN) { + $view = ENTITY_INVOICE; + } else { + $view = 'design' . ($account->email_design_id - 1); + } - $response = $this->sendTo($invitation->contact->email, $fromEmail, $account->getDisplayName(), $subject, ENTITY_INVOICE, $data); + $response = $this->sendTo($invitation->contact->email, $fromEmail, $account->getDisplayName(), $subject, $view, $data); if ($response === true) { return true; @@ -192,22 +215,33 @@ class ContactMailer extends Mailer private function processVariables($template, $data) { + $account = $data['account']; + $client = $data['client']; + $invitation = $data['invitation']; + $invoice = $invitation->invoice; + $variables = [ - '$footer' => $data['account']->getEmailFooter(), - '$link' => $data['invitation']->getLink(), - '$client' => $data['client']->getDisplayName(), - '$account' => $data['account']->getDisplayName(), - '$contact' => $data['invitation']->contact->getDisplayName(), - '$firstName' => $data['invitation']->contact->first_name, - '$amount' => Utils::formatMoney($data['amount'], $data['client']->getCurrencyId()), - '$invoice' => $data['invitation']->invoice->invoice_number, - '$quote' => $data['invitation']->invoice->invoice_number, - '$advancedRawInvoice->' => '$' + '$footer' => $account->getEmailFooter(), + '$client' => $client->getDisplayName(), + '$account' => $account->getDisplayName(), + '$contact' => $invitation->contact->getDisplayName(), + '$firstName' => $invitation->contact->first_name, + '$amount' => Utils::formatMoney($data['amount'], $client->getCurrencyId()), + '$invoice' => $invoice->invoice_number, + '$quote' => $invoice->invoice_number, + '$link' => $invitation->getLink(), + '$viewLink' => $invitation->getLink(), + '$viewButton' => HTML::emailViewButton($invitation->getLink(), $invoice->getEntityType()), + '$paymentLink' => $invitation->getLink('payment'), + '$paymentButton' => HTML::emailPaymentButton($invitation->getLink('payment')), ]; // Add variables for available payment types - foreach (Gateway::getPaymentTypeLinks() as $type) { - $variables["\${$type}_link"] = URL::to("/payment/{$data['invitation']->invitation_key}/{$type}"); + foreach (Gateway::$paymentTypes as $type) { + $camelType = Gateway::getPaymentTypeName($type); + $type = Utils::toSnakeCase($camelType); + $variables["\${$camelType}Link"] = $invitation->getLink() . "/{$type}"; + $variables["\${$camelType}Button"] = HTML::emailPaymentButton($invitation->getLink('payment') . "/{$type}"); } $str = str_replace(array_keys($variables), array_values($variables), $template); diff --git a/app/Ninja/Mailers/Mailer.php b/app/Ninja/Mailers/Mailer.php index 34db634f88..d1aa10ec7c 100644 --- a/app/Ninja/Mailers/Mailer.php +++ b/app/Ninja/Mailers/Mailer.php @@ -67,7 +67,7 @@ class Mailer private function handleFailure($exception) { - if (isset($_ENV['POSTMARK_API_TOKEN']) && $exception->getResponse()) { + if (isset($_ENV['POSTMARK_API_TOKEN']) && method_exists($exception, 'getResponse')) { $response = $exception->getResponse()->getBody()->getContents(); $response = json_decode($response); $emailError = nl2br($response->Message); diff --git a/app/Ninja/Presenters/InvoicePresenter.php b/app/Ninja/Presenters/InvoicePresenter.php index dff59c241b..8a03ff4ac1 100644 --- a/app/Ninja/Presenters/InvoicePresenter.php +++ b/app/Ninja/Presenters/InvoicePresenter.php @@ -15,6 +15,17 @@ class InvoicePresenter extends Presenter { return $this->entity->user->getDisplayName(); } + public function balanceDueLabel() + { + if ($this->entity->partial) { + return 'amount_due'; + } elseif ($this->entity->is_quote) { + return 'total'; + } else { + return 'balance_due'; + } + } + public function balance_due() { $amount = $this->entity->getRequestedAmount(); diff --git a/app/Ninja/Repositories/ActivityRepository.php b/app/Ninja/Repositories/ActivityRepository.php index 811b5fd5c5..8ac316c747 100644 --- a/app/Ninja/Repositories/ActivityRepository.php +++ b/app/Ninja/Repositories/ActivityRepository.php @@ -44,7 +44,7 @@ class ActivityRepository { $activity = new Activity(); - if (Auth::check()) { + if (Auth::check() && Auth::user()->account_id == $entity->account_id) { $activity->user_id = Auth::user()->id; $activity->account_id = Auth::user()->account_id; } else { diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 8a7e9bfad2..bf67c12498 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -65,6 +65,29 @@ class AppServiceProvider extends ServiceProvider { return 'data:image/jpeg;base64,' . base64_encode(file_get_contents(public_path().'/'.$imagePath)); }); + HTML::macro('flatButton', function($label, $color) { + return ''; + }); + + HTML::macro('emailViewButton', function($link = '#', $entityType = ENTITY_INVOICE) { + return view('partials.email_button') + ->with([ + 'link' => $link, + 'field' => "view_{$entityType}", + 'color' => '#0b4d78', + ]) + ->render(); + }); + + HTML::macro('emailPaymentButton', function($link = '#') { + return view('partials.email_button') + ->with([ + 'link' => $link, + 'field' => 'pay_now', + 'color' => '#36c157', + ]) + ->render(); + }); HTML::macro('breadcrumbs', function() { $str = '

    '; diff --git a/app/Services/UserService.php b/app/Services/UserService.php index 77547b8df8..a8b9bc5691 100644 --- a/app/Services/UserService.php +++ b/app/Services/UserService.php @@ -40,7 +40,7 @@ class UserService extends BaseService [ 'first_name', function ($model) { - return link_to('users/'.$model->public_id.'/edit', $model->first_name.' '.$model->last_name); + return $model->public_id ? link_to('users/'.$model->public_id.'/edit', $model->first_name.' '.$model->last_name) : ($model->first_name.' '.$model->last_name); } ], [ diff --git a/database/migrations/2013_11_05_180133_confide_setup_users_table.php b/database/migrations/2013_11_05_180133_confide_setup_users_table.php index 08a3bbf91b..6bd69f5039 100644 --- a/database/migrations/2013_11_05_180133_confide_setup_users_table.php +++ b/database/migrations/2013_11_05_180133_confide_setup_users_table.php @@ -317,12 +317,12 @@ class ConfideSetupUsersTable extends Migration { $t->date('due_date')->nullable(); $t->text('terms'); $t->text('public_notes'); - $t->boolean('is_deleted')->default(false); - $t->boolean('is_recurring'); + $t->boolean('is_deleted')->default(false); + $t->boolean('is_recurring')->default(false); $t->unsignedInteger('frequency_id'); $t->date('start_date')->nullable(); $t->date('end_date')->nullable(); - $t->timestamp('last_sent_date')->nullable(); + $t->timestamp('last_sent_date')->nullable(); $t->unsignedInteger('recurring_invoice_id')->index()->nullable(); $t->string('tax_name'); diff --git a/database/migrations/2015_11_30_133206_add_email_designs.php b/database/migrations/2015_11_30_133206_add_email_designs.php new file mode 100644 index 0000000000..08d506251f --- /dev/null +++ b/database/migrations/2015_11_30_133206_add_email_designs.php @@ -0,0 +1,34 @@ +smallInteger('email_design_id')->default(1); + $table->boolean('enable_email_markup')->default(false); + $table->string('website')->nullable(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('accounts', function ($table) { + $table->dropColumn('email_design_id'); + $table->dropColumn('enable_email_markup'); + $table->dropColumn('website'); + }); + } +} diff --git a/public/css/built.css b/public/css/built.css index 94e81164bd..94203d9c4b 100644 --- a/public/css/built.css +++ b/public/css/built.css @@ -3381,4 +3381,19 @@ ul.user-accounts a:hover div.remove { div.panel-body div.panel-body { padding-bottom: 0px; +} + +.email-button { + border: 0 none; + border-radius: 36px; + + padding: 12px 45px; + margin: 0 10px; + + cursor: pointer; + display: inline-block; + + font-size: 14px; + color: #fff; + text-transform: none; } \ No newline at end of file diff --git a/public/js/built.js b/public/js/built.js index 73deb11cdd..82cf121b6a 100644 --- a/public/js/built.js +++ b/public/js/built.js @@ -31758,7 +31758,7 @@ NINJA.decodeJavascript = function(invoice, javascript) } else if (invoice.is_quote && field == 'your_invoice') { field = 'your_quote'; } - var label = invoiceLabels[field]; + var label = invoiceLabels[field]; if (match.indexOf('UC') >= 0) { label = label.toUpperCase(); } diff --git a/readme.md b/readme.md index 3bb80b1a58..2289653e68 100644 --- a/readme.md +++ b/readme.md @@ -41,6 +41,10 @@ There are two options: * [Zapier](https://zapier.com/) integration * [D3.js](http://d3js.org/) visualizations +### Recommended Providers +* [Stripe](https://stripe.com/) +* [Postmark](https://postmarkapp.com/) + ### Documentation * [Ubuntu and Apache](http://blog.technerdservices.com/index.php/2015/04/techpop-how-to-install-invoice-ninja-on-ubuntu-14-04/) * [Debian and Nginx](https://www.rosehosting.com/blog/install-invoice-ninja-on-a-debian-7-vps/) @@ -55,10 +59,6 @@ There are two options: * [Jeramy Simpson](https://github.com/JeramyMywork) - [MyWork](https://www.mywork.com.au) * [Sigitas Limontas](https://lt.linkedin.com/in/sigitaslimontas) -### Recommended Providers -* [Stripe](https://stripe.com/) -* [Postmark](https://postmarkapp.com/) - ### Frameworks/Libraries * [laravel/laravel](https://github.com/laravel/laravel) - A PHP Framework For Web Artisans * [twbs/bootstrap](https://github.com/twbs/bootstrap) - Sleek, intuitive, and powerful front-end framework for faster and easier web development. diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php index bee2302645..b09552781c 100644 --- a/resources/lang/en/texts.php +++ b/resources/lang/en/texts.php @@ -953,5 +953,16 @@ return array( 'secret_key' => 'Secret Key', 'missing_publishable_key' => 'Set your Stripe publishable key for an improved checkout process', + 'email_design' => 'Email Design', + 'due_by' => 'Due by :date', + 'enable_email_markup' => 'Enable Email Markup', + 'enable_email_markup_help' => 'Make it easier for your clients to pay you by adding schema.org markup to your emails.', + 'template_help_title' => 'Templates Help', + 'template_help_1' => 'Available variables:', + 'email_design_id' => 'Email Design', + 'email_design_help' => 'Make your emails look more professional with HTML layouts', + 'plain' => 'Plain', + 'light' => 'Light', + 'dark' => 'Dark', ); diff --git a/resources/views/accounts/template.blade.php b/resources/views/accounts/template.blade.php index 13f080c37f..4938296e5b 100644 --- a/resources/views/accounts/template.blade.php +++ b/resources/views/accounts/template.blade.php @@ -16,6 +16,8 @@
    {{ trans("texts.reset") }}
    {!! Former::text('email_subject_' . $field) ->label(trans('texts.subject')) + ->appendIcon('question-sign') + ->addGroupClass('email-subject') ->addClass('enable-' . $field) !!}
    @@ -48,25 +50,30 @@
    - \ No newline at end of file + editor.setHTML($('#email_template_{{ $field }}').val()); + editor.on('text-change', function(delta, source) { + if (source == 'api') { + return; + } + var html = editors['{{ $field }}'].getHTML(); + $('#email_template_{{ $field }}').val(html); + refreshPreview(); + NINJA.formIsChanged = true; + }); + editors['{{ $field }}'] = editor; + }); + + $('.email-subject .input-group-addon').click(function() { + $('#templateHelpModal').modal('show'); + }); + + \ No newline at end of file diff --git a/resources/views/accounts/templates_and_reminders.blade.php b/resources/views/accounts/templates_and_reminders.blade.php index ad58acc119..c8b90b3383 100644 --- a/resources/views/accounts/templates_and_reminders.blade.php +++ b/resources/views/accounts/templates_and_reminders.blade.php @@ -32,9 +32,35 @@ @endforeach @endforeach - {!! Former::populateField("enable_reminder1", intval($account->enable_reminder1)) !!} - {!! Former::populateField("enable_reminder2", intval($account->enable_reminder2)) !!} - {!! Former::populateField("enable_reminder3", intval($account->enable_reminder3)) !!} + {!! Former::populateField('enable_reminder1', intval($account->enable_reminder1)) !!} + {!! Former::populateField('enable_reminder2', intval($account->enable_reminder2)) !!} + {!! Former::populateField('enable_reminder3', intval($account->enable_reminder3)) !!} + {!! Former::populateField('enable_email_markup', intval($account->enable_email_markup)) !!} + + +
    +
    +

    {!! trans('texts.email_design') !!}

    +
    +
    + + {!! Former::select('email_design_id') + ->style('width: 200px') + ->addOption(trans('texts.plain'), 1) + ->addOption(trans('texts.light'), 2) + ->addOption(trans('texts.dark'), 3) + ->help(trans('texts.email_design_help')) !!} + + @if (Utils::isNinja()) +   + {!! Former::checkbox('enable_email_markup') + ->text(trans('texts.enable_email_markup')) + ->label('') + ->help(trans('texts.enable_email_markup_help')) !!} + {!! link_to(EMAIL_MARKUP_URL, trans('texts.learn_more'), ['target' => '_blank']) !!} + @endif +
    +
    @@ -83,6 +109,39 @@
    + + @if (Auth::user()->isPro())
    {!! Button::success(trans('texts.save'))->submit()->large()->appendIcon(Icon::create('floppy-disk')) !!} @@ -146,34 +205,29 @@ return ''; } - keys = [ - 'footer', - 'account', - 'client', - 'amount', - 'link', - 'contact', - 'firstName', - 'invoice', - 'quote' - ]; - - vals = [ + var keys = {!! json_encode(\App\Ninja\Mailers\ContactMailer::$variableFields) !!}; + var vals = [ {!! json_encode($emailFooter) !!}, "{{ Auth::user()->account->getDisplayName() }}", "Client Name", formatMoney(100), - "{{ Auth::user()->account->getSiteUrl() . '...' }}", "Contact Name", "First Name", "0001", - "0001" + "0001", + "{{ URL::to('/view/...') }}", + '{!! HTML::flatButton('view_invoice', '#0b4d78') !!}', + "{{ URL::to('/payment/...') }}", + '{!! HTML::flatButton('pay_now', '#36c157') !!}', ]; // Add any available payment method links - @foreach (\App\Models\Gateway::getPaymentTypeLinks() as $type) - {!! "keys.push('" . $type.'_link' . "');" !!} - {!! "vals.push('" . URL::to("/payment/xxxxxx/{$type}") . "');" !!} + @foreach (\App\Models\Gateway::$paymentTypes as $type) + {!! "keys.push('" . \App\Models\Gateway::getPaymentTypeName($type).'Link' . "');" !!} + {!! "vals.push('" . URL::to('/payment/...') . "');" !!} + + {!! "keys.push('" . \App\Models\Gateway::getPaymentTypeName($type).'Button' . "');" !!} + {!! "vals.push('" . HTML::flatButton('pay_now', '#36c157') . "');" !!} @endforeach for (var i=0; i +   + + + + + + + + + +
    +

    + + @if ($invoice->due_date) + {{ strtoupper(trans('texts.due_by', ['date' => $account->formatDate($invoice->due_date)])) }} + @endif +
    + + {{ trans("texts.{$entityType}") }} {{ $invoice->invoice_number }} + +

    +     		+

    + + {{ trans('texts.' . $invoice->present()->balanceDueLabel) }}: +
    + + {{ $account->formatMoney($invoice->getRequestedAmount(), $client) }} + +

    +
    + + + + +
    {!! $body !!}
    + + +@stop \ No newline at end of file diff --git a/resources/views/emails/design1_text.blade.php b/resources/views/emails/design1_text.blade.php new file mode 100644 index 0000000000..9b258c53a8 --- /dev/null +++ b/resources/views/emails/design1_text.blade.php @@ -0,0 +1 @@ +{!! strip_tags($body) !!} \ No newline at end of file diff --git a/resources/views/emails/design2_html.blade.php b/resources/views/emails/design2_html.blade.php new file mode 100644 index 0000000000..69e749ceea --- /dev/null +++ b/resources/views/emails/design2_html.blade.php @@ -0,0 +1,46 @@ +@extends('emails.master') + +@section('content') + +   + + + + + + + + + +
    +

    + + @if ($invoice->due_date) + {{ strtoupper(trans('texts.due_by', ['date' => $account->formatDate($invoice->due_date)])) }} + @endif +
    + + {{ trans("texts.{$entityType}") }} {{ $invoice->invoice_number }} + +

    +     		+

    + + {{ strtoupper(trans('texts.' . $invoice->present()->balanceDueLabel)) }}: +
    + + {{ $account->formatMoney($invoice->getRequestedAmount(), $client) }} + +

    +
    + + + + +
    {!! $body !!}
    + + +@stop \ No newline at end of file diff --git a/resources/views/emails/design2_text.blade.php b/resources/views/emails/design2_text.blade.php new file mode 100644 index 0000000000..9b258c53a8 --- /dev/null +++ b/resources/views/emails/design2_text.blade.php @@ -0,0 +1 @@ +{!! strip_tags($body) !!} \ No newline at end of file diff --git a/resources/views/emails/invoice_html.blade.php b/resources/views/emails/invoice_html.blade.php index 880bd1e82a..86a799dc1d 100644 --- a/resources/views/emails/invoice_html.blade.php +++ b/resources/views/emails/invoice_html.blade.php @@ -4,7 +4,7 @@ - @if (Utils::isNinjaDev()) + @if ($account->enable_email_markup) @include('emails.view_action', ['link' => $link, 'entityType' => $entityType]) @endif {!! $body !!} diff --git a/resources/views/emails/master.blade.php b/resources/views/emails/master.blade.php new file mode 100644 index 0000000000..b5386cb95f --- /dev/null +++ b/resources/views/emails/master.blade.php @@ -0,0 +1,85 @@ + + + + + + + + @if ($account->enable_email_markup) + @include('emails.view_action', ['link' => $link, 'entityType' => $entityType]) + @endif + + + +
    + + + + @yield('content') + + + + + +
    +

    + {{ $account->address1 }} + @if ($account->address1 && $account->getCityState()) + - + @endif + {{ $account->getCityState() }} + @if ($account->address1 || $account->getCityState()) +
    + @endif + + @if ($account->website) + {{ $account->website }} + @endif +

    +
    +
    + + + + \ No newline at end of file diff --git a/resources/views/emails/partials/account_logo.blade.php b/resources/views/emails/partials/account_logo.blade.php new file mode 100644 index 0000000000..c16e142fd5 --- /dev/null +++ b/resources/views/emails/partials/account_logo.blade.php @@ -0,0 +1,11 @@ +@if ($account->hasLogo()) + @if ($account->website) + + @endif + + + + @if ($account->website) + + @endif +@endif diff --git a/resources/views/partials/email_button.blade.php b/resources/views/partials/email_button.blade.php new file mode 100644 index 0000000000..f6055168d7 --- /dev/null +++ b/resources/views/partials/email_button.blade.php @@ -0,0 +1,22 @@ + +
    + + + + +
    + + + {{ trans("texts.{$field}") }} + + +
    + +
    \ No newline at end of file