\$client,
"; - if ($this->isPro() && $this->email_design_id != EMAIL_DESIGN_PLAIN) { + if ($this->hasFeature(FEATURE_CUSTOM_EMAILS) && $this->email_design_id != EMAIL_DESIGN_PLAIN) { $template .= "
" . trans("texts.{$entityType}_message_button", ['amount' => '$amount']) . "
" . "
\$viewButton
"; } else { @@ -929,7 +1163,7 @@ class Account extends Eloquent { $template = false; - if ($this->isPro()) { + if ($this->hasFeature(FEATURE_CUSTOM_EMAILS)) { $field = "email_template_{$entityType}"; $template = $this->$field; } @@ -942,13 +1176,18 @@ class Account extends Eloquent return str_replace('/>', ' />', $template); } + public function getTemplateView($view = '') + { + return $this->getEmailDesignId() == EMAIL_DESIGN_PLAIN ? $view : 'design' . $this->getEmailDesignId(); + } + public function getEmailFooter() { if ($this->email_footer) { // 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
" . trans('texts.email_signature') . "\n
\$account
";
}
}
@@ -1025,7 +1264,7 @@ class Account extends Eloquent
public function showCustomField($field, $entity = false)
{
- if ($this->isPro()) {
+ if ($this->hasFeature(FEATURE_INVOICE_SETTINGS)) {
return $this->$field ? true : false;
}
@@ -1041,18 +1280,18 @@ class Account extends Eloquent
public function attatchPDF()
{
- return $this->isPro() && $this->pdf_email_attachment;
+ return $this->hasFeature(FEATURE_PDF_ATTACHMENT) && $this->pdf_email_attachment;
}
public function getEmailDesignId()
{
- return $this->isPro() ? $this->email_design_id : EMAIL_DESIGN_PLAIN;
+ return $this->hasFeature(FEATURE_CUSTOM_EMAILS) ? $this->email_design_id : EMAIL_DESIGN_PLAIN;
}
public function clientViewCSS(){
- $css = null;
+ $css = '';
- if ($this->isPro()) {
+ if ($this->hasFeature(FEATURE_CUSTOMIZE_INVOICE_DESIGN)) {
$bodyFont = $this->getBodyFontCss();
$headerFont = $this->getHeaderFontCss();
@@ -1060,27 +1299,15 @@ class Account extends Eloquent
if ($headerFont != $bodyFont) {
$css .= 'h1,h2,h3,h4,h5,h6,.h1,.h2,.h3,.h4,.h5,.h6{'.$headerFont.'}';
}
-
- if ((Utils::isNinja() && $this->isPro()) || $this->isWhiteLabel()) {
- // For self-hosted users, a white-label license is required for custom CSS
- $css .= $this->client_view_css;
- }
+ }
+ if ($this->hasFeature(FEATURE_CLIENT_PORTAL_CSS)) {
+ // For self-hosted users, a white-label license is required for custom CSS
+ $css .= $this->client_view_css;
}
return $css;
}
- public function hasLargeFont()
- {
- foreach (['chinese', 'japanese'] as $language) {
- if (stripos($this->getBodyFontName(), $language) || stripos($this->getHeaderFontName(), $language)) {
- return true;
- }
- }
-
- return false;
- }
-
public function getFontsUrl($protocol = ''){
$bodyFont = $this->getHeaderFontId();
$headerFont = $this->getBodyFontId();
@@ -1097,11 +1324,11 @@ class Account extends Eloquent
}
public function getHeaderFontId() {
- return ($this->isPro() && $this->header_font_id) ? $this->header_font_id : DEFAULT_HEADER_FONT;
+ return ($this->hasFeature(FEATURE_CUSTOMIZE_INVOICE_DESIGN) && $this->header_font_id) ? $this->header_font_id : DEFAULT_HEADER_FONT;
}
public function getBodyFontId() {
- return ($this->isPro() && $this->body_font_id) ? $this->body_font_id : DEFAULT_BODY_FONT;
+ return ($this->hasFeature(FEATURE_CUSTOMIZE_INVOICE_DESIGN) && $this->body_font_id) ? $this->body_font_id : DEFAULT_BODY_FONT;
}
public function getHeaderFontName(){
diff --git a/app/Models/AccountGateway.php b/app/Models/AccountGateway.php
index a4027db6ef36..5e951285349e 100644
--- a/app/Models/AccountGateway.php
+++ b/app/Models/AccountGateway.php
@@ -60,13 +60,7 @@ class AccountGateway extends EntityModel
public function getConfigField($field)
{
- $config = $this->getConfig();
-
- if (!$field || !property_exists($config, $field)) {
- return false;
- }
-
- return $config->$field;
+ return object_get($this->getConfig(), $field, false);
}
public function getPublishableStripeKey()
diff --git a/app/Models/AccountToken.php b/app/Models/AccountToken.php
index dd9a98800535..87728b37016e 100644
--- a/app/Models/AccountToken.php
+++ b/app/Models/AccountToken.php
@@ -16,4 +16,9 @@ class AccountToken extends EntityModel
{
return $this->belongsTo('App\Models\Account');
}
+
+ public function user()
+ {
+ return $this->belongsTo('App\Models\User');
+ }
}
diff --git a/app/Models/Client.php b/app/Models/Client.php
index 92232647117c..6d2b44fbac90 100644
--- a/app/Models/Client.php
+++ b/app/Models/Client.php
@@ -146,7 +146,7 @@ class Client extends EntityModel
public function addContact($data, $isPrimary = false)
{
- $publicId = isset($data['public_id']) ? $data['public_id'] : false;
+ $publicId = isset($data['public_id']) ? $data['public_id'] : (isset($data['id']) ? $data['id'] : false);
if ($publicId && $publicId != '-1') {
$contact = Contact::scope($publicId)->firstOrFail();
@@ -155,7 +155,7 @@ class Client extends EntityModel
$contact->send_invoice = true;
}
- if (!Utils::isPro() || $this->account->enable_portal_password){
+ if (Utils::hasFeature(FEATURE_CLIENT_PORTAL_PASSWORD) && $this->account->enable_portal_password){
if(!empty($data['password']) && $data['password']!='-%unchanged%-'){
$contact->password = bcrypt($data['password']);
} else if(empty($data['password'])){
@@ -199,6 +199,13 @@ class Client extends EntityModel
return $this->name;
}
+ public function getPrimaryContact()
+ {
+ return $this->contacts()
+ ->whereIsPrimary(true)
+ ->first();
+ }
+
public function getDisplayName()
{
if ($this->name) {
@@ -256,13 +263,17 @@ class Client extends EntityModel
public function getGatewayToken()
{
- $this->account->load('account_gateways');
+ $account = $this->account;
+
+ if ( ! $account->relationLoaded('account_gateways')) {
+ $account->load('account_gateways');
+ }
- if (!count($this->account->account_gateways)) {
+ if (!count($account->account_gateways)) {
return false;
}
- $accountGateway = $this->account->getGatewayConfig(GATEWAY_STRIPE);
+ $accountGateway = $account->getGatewayConfig(GATEWAY_STRIPE);
if (!$accountGateway) {
return false;
diff --git a/app/Models/Company.php b/app/Models/Company.php
new file mode 100644
index 000000000000..1345db9e4bfb
--- /dev/null
+++ b/app/Models/Company.php
@@ -0,0 +1,21 @@
+hasMany('App\Models\Account');
+ }
+
+ public function payment()
+ {
+ return $this->belongsTo('App\Models\Payment');
+ }
+}
diff --git a/app/Models/Document.php b/app/Models/Document.php
new file mode 100644
index 000000000000..6d9c24857143
--- /dev/null
+++ b/app/Models/Document.php
@@ -0,0 +1,249 @@
+ 'jpeg',
+ 'tif' => 'tiff',
+ );
+
+ public static $allowedMimes = array(// Used by Dropzone.js; does not affect what the server accepts
+ 'image/png', 'image/jpeg', 'image/tiff', 'application/pdf', 'image/gif', 'image/vnd.adobe.photoshop', 'text/plain',
+ 'application/zip', 'application/msword',
+ 'application/excel', 'application/vnd.ms-excel', 'application/x-excel', 'application/x-msexcel',
+ 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+ 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet','application/postscript', 'image/svg+xml',
+ 'application/vnd.openxmlformats-officedocument.presentationml.presentation', 'application/vnd.ms-powerpoint',
+ );
+
+ public static $types = array(
+ 'png' => array(
+ 'mime' => 'image/png',
+ ),
+ 'ai' => array(
+ 'mime' => 'application/postscript',
+ ),
+ 'svg' => array(
+ 'mime' => 'image/svg+xml',
+ ),
+ 'jpeg' => array(
+ 'mime' => 'image/jpeg',
+ ),
+ 'tiff' => array(
+ 'mime' => 'image/tiff',
+ ),
+ 'pdf' => array(
+ 'mime' => 'application/pdf',
+ ),
+ 'gif' => array(
+ 'mime' => 'image/gif',
+ ),
+ 'psd' => array(
+ 'mime' => 'image/vnd.adobe.photoshop',
+ ),
+ 'txt' => array(
+ 'mime' => 'text/plain',
+ ),
+ 'zip' => array(
+ 'mime' => 'application/zip',
+ ),
+ 'doc' => array(
+ 'mime' => 'application/msword',
+ ),
+ 'xls' => array(
+ 'mime' => 'application/vnd.ms-excel',
+ ),
+ 'ppt' => array(
+ 'mime' => 'application/vnd.ms-powerpoint',
+ ),
+ 'xlsx' => array(
+ 'mime' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+ ),
+ 'docx' => array(
+ 'mime' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+ ),
+ 'pptx' => array(
+ 'mime' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+ ),
+ );
+
+ public function fill(array $attributes)
+ {
+ parent::fill($attributes);
+
+ if(empty($this->attributes['disk'])){
+ $this->attributes['disk'] = env('DOCUMENT_FILESYSTEM', 'documents');
+ }
+
+ return $this;
+ }
+
+ public function account()
+ {
+ return $this->belongsTo('App\Models\Account');
+ }
+
+ public function user()
+ {
+ return $this->belongsTo('App\Models\User');
+ }
+
+ public function expense()
+ {
+ return $this->belongsTo('App\Models\Expense')->withTrashed();
+ }
+
+ public function invoice()
+ {
+ return $this->belongsTo('App\Models\Invoice')->withTrashed();
+ }
+
+ public function getDisk(){
+ return Storage::disk(!empty($this->disk)?$this->disk:env('DOCUMENT_FILESYSTEM', 'documents'));
+ }
+
+ public function setDiskAttribute($value)
+ {
+ $this->attributes['disk'] = $value?$value:env('DOCUMENT_FILESYSTEM', 'documents');
+ }
+
+ public function getDirectUrl(){
+ return static::getDirectFileUrl($this->path, $this->getDisk());
+ }
+
+ public function getDirectPreviewUrl(){
+ return $this->preview?static::getDirectFileUrl($this->preview, $this->getDisk(), true):null;
+ }
+
+ public static function getDirectFileUrl($path, $disk, $prioritizeSpeed = false){
+ $adapter = $disk->getAdapter();
+ $fullPath = $adapter->applyPathPrefix($path);
+
+ if($adapter instanceof \League\Flysystem\AwsS3v3\AwsS3Adapter) {
+ $client = $adapter->getClient();
+ $command = $client->getCommand('GetObject', [
+ 'Bucket' => $adapter->getBucket(),
+ 'Key' => $fullPath
+ ]);
+
+ return (string) $client->createPresignedRequest($command, '+10 minutes')->getUri();
+ } else if (!$prioritizeSpeed // Rackspace temp URLs are slow, so we don't use them for previews
+ && $adapter instanceof \League\Flysystem\Rackspace\RackspaceAdapter) {
+ $secret = env('RACKSPACE_TEMP_URL_SECRET');
+ if($secret){
+ $object = $adapter->getContainer()->getObject($fullPath);
+
+ if(env('RACKSPACE_TEMP_URL_SECRET_SET')){
+ // Go ahead and set the secret too
+ $object->getService()->getAccount()->setTempUrlSecret($secret);
+ }
+
+ $url = $object->getUrl();
+ $expiry = strtotime('+10 minutes');
+ $urlPath = urldecode($url->getPath());
+ $body = sprintf("%s\n%d\n%s", 'GET', $expiry, $urlPath);
+ $hash = hash_hmac('sha1', $body, $secret);
+ return sprintf('%s?temp_url_sig=%s&temp_url_expires=%d', $url, $hash, $expiry);
+ }
+ }
+
+ return null;
+ }
+
+ public function getRaw(){
+ $disk = $this->getDisk();
+
+ return $disk->get($this->path);
+ }
+
+ public function getStream(){
+ $disk = $this->getDisk();
+
+ return $disk->readStream($this->path);
+ }
+
+ public function getRawPreview(){
+ $disk = $this->getDisk();
+
+ return $disk->get($this->preview);
+ }
+
+ public function getUrl(){
+ return url('documents/'.$this->public_id.'/'.$this->name);
+ }
+
+ public function getClientUrl($invitation){
+ return url('client/documents/'.$invitation->invitation_key.'/'.$this->public_id.'/'.$this->name);
+ }
+
+ public function isPDFEmbeddable(){
+ return $this->type == 'jpeg' || $this->type == 'png' || $this->preview;
+ }
+
+ public function getVFSJSUrl(){
+ if(!$this->isPDFEmbeddable())return null;
+ return url('documents/js/'.$this->public_id.'/'.$this->name.'.js');
+ }
+
+ public function getClientVFSJSUrl(){
+ if(!$this->isPDFEmbeddable())return null;
+ return url('client/documents/js/'.$this->public_id.'/'.$this->name.'.js');
+ }
+
+ public function getPreviewUrl(){
+ return $this->preview?url('documents/preview/'.$this->public_id.'/'.$this->name.'.'.pathinfo($this->preview, PATHINFO_EXTENSION)):null;
+ }
+
+ public function toArray()
+ {
+ $array = parent::toArray();
+
+ if(empty($this->visible) || in_array('url', $this->visible))$array['url'] = $this->getUrl();
+ if(empty($this->visible) || in_array('preview_url', $this->visible))$array['preview_url'] = $this->getPreviewUrl();
+
+ return $array;
+ }
+
+ public function cloneDocument(){
+ $document = Document::createNew($this);
+ $document->path = $this->path;
+ $document->preview = $this->preview;
+ $document->name = $this->name;
+ $document->type = $this->type;
+ $document->disk = $this->disk;
+ $document->hash = $this->hash;
+ $document->size = $this->size;
+ $document->width = $this->width;
+ $document->height = $this->height;
+
+ return $document;
+ }
+}
+
+Document::deleted(function ($document) {
+ $same_path_count = DB::table('documents')
+ ->where('documents.account_id', '=', $document->account_id)
+ ->where('documents.path', '=', $document->path)
+ ->where('documents.disk', '=', $document->disk)
+ ->count();
+
+ if(!$same_path_count){
+ $document->getDisk()->delete($document->path);
+ }
+
+ if($document->preview){
+ $same_preview_count = DB::table('documents')
+ ->where('documents.account_id', '=', $document->account_id)
+ ->where('documents.preview', '=', $document->preview)
+ ->where('documents.disk', '=', $document->disk)
+ ->count();
+ if(!$same_preview_count){
+ $document->getDisk()->delete($document->preview);
+ }
+ }
+
+});
\ No newline at end of file
diff --git a/app/Models/EntityModel.php b/app/Models/EntityModel.php
index aa6544e52f8b..95e85e6acef4 100644
--- a/app/Models/EntityModel.php
+++ b/app/Models/EntityModel.php
@@ -24,9 +24,14 @@ class EntityModel extends Eloquent
Utils::fatalError();
}
- $lastEntity = $className::withTrashed()
- ->scope(false, $entity->account_id)
- ->orderBy('public_id', 'DESC')
+ if(method_exists($className, 'withTrashed')){
+ $lastEntity = $className::withTrashed()
+ ->scope(false, $entity->account_id);
+ } else {
+ $lastEntity = $className::scope(false, $entity->account_id);
+ }
+
+ $lastEntity = $lastEntity->orderBy('public_id', 'DESC')
->first();
if ($lastEntity) {
@@ -96,6 +101,16 @@ class EntityModel extends Eloquent
return $this->getName();
}
+ public static function getClassName($entityType)
+ {
+ return 'App\\Models\\' . ucwords(Utils::toCamelCase($entityType));
+ }
+
+ public static function getTransformerName($entityType)
+ {
+ return 'App\\Ninja\\Transformers\\' . ucwords(Utils::toCamelCase($entityType)) . 'Transformer';
+ }
+
public function setNullValues()
{
foreach ($this->fillable as $field) {
@@ -113,56 +128,4 @@ class EntityModel extends Eloquent
$name = $parts[count($parts)-1];
return strtolower($name) . '_id';
}
-
- public static function canCreate() {
- return Auth::user()->hasPermission('create_all');
- }
-
- public function canEdit() {
- return static::canEditItem($this);
- }
-
- public static function canEditItem($item) {
- return Auth::user()->hasPermission('edit_all') || (isset($item->user_id) && Auth::user()->id == $item->user_id);
- }
-
- public static function canEditItemById($item_id) {
- if(Auth::user()->hasPermission('edit_all')) {
- return true;
- }
-
- return static::whereId($item_id)->first()->user_id == Auth::user()->id;
- }
-
- public static function canEditItemByOwner($user_id) {
- if(Auth::user()->hasPermission('edit_all')) {
- return true;
- }
-
- return Auth::user()->id == $user_id;
- }
-
- public function canView() {
- return static::canViewItem($this);
- }
-
- public static function canViewItem($item) {
- return Auth::user()->hasPermission('view_all') || (isset($item->user_id) && Auth::user()->id == $item->user_id);
- }
-
- public static function canViewItemById($item_id) {
- if(Auth::user()->hasPermission('view_all')) {
- return true;
- }
-
- return static::whereId($item_id)->first()->user_id == Auth::user()->id;
- }
-
- public static function canViewItemByOwner($user_id) {
- if(Auth::user()->hasPermission('view_all')) {
- return true;
- }
-
- return Auth::user()->id == $user_id;
- }
}
diff --git a/app/Models/Expense.php b/app/Models/Expense.php
index 2d1b8041d7ee..316491a5356b 100644
--- a/app/Models/Expense.php
+++ b/app/Models/Expense.php
@@ -53,6 +53,11 @@ class Expense extends EntityModel
return $this->belongsTo('App\Models\Invoice')->withTrashed();
}
+ public function documents()
+ {
+ return $this->hasMany('App\Models\Document')->orderBy('id');
+ }
+
public function getName()
{
if($this->expense_number)
@@ -80,6 +85,20 @@ class Expense extends EntityModel
{
return $this->invoice_currency_id != $this->expense_currency_id;
}
+
+ public function convertedAmount()
+ {
+ return round($this->amount * $this->exchange_rate, 2);
+ }
+
+ public function toArray()
+ {
+ $array = parent::toArray();
+
+ if(empty($this->visible) || in_array('converted_amount', $this->visible))$array['converted_amount'] = $this->convertedAmount();
+
+ return $array;
+ }
}
Expense::creating(function ($expense) {
diff --git a/app/Models/Invitation.php b/app/Models/Invitation.php
index 7abd074a08b4..becd0197c93f 100644
--- a/app/Models/Invitation.php
+++ b/app/Models/Invitation.php
@@ -29,7 +29,9 @@ class Invitation extends EntityModel
return $this->belongsTo('App\Models\Account');
}
- public function getLink($type = 'view')
+ // If we're getting the link for PhantomJS to generate the PDF
+ // we need to make sure it's served from our site
+ public function getLink($type = 'view', $forceOnsite = false)
{
if (!$this->account) {
$this->load('account');
@@ -38,8 +40,8 @@ class Invitation extends EntityModel
$url = SITE_URL;
$iframe_url = $this->account->iframe_url;
- if ($this->account->isPro()) {
- if ($iframe_url) {
+ if ($this->account->hasFeature(FEATURE_CUSTOM_URL)) {
+ if ($iframe_url && !$forceOnsite) {
return "{$iframe_url}?{$this->invitation_key}";
} elseif ($this->account->subdomain) {
$url = Utils::replaceSubdomain($url, $this->account->subdomain);
diff --git a/app/Models/Invoice.php b/app/Models/Invoice.php
index 340ce419b757..5c006ecd9eaa 100644
--- a/app/Models/Invoice.php
+++ b/app/Models/Invoice.php
@@ -2,6 +2,7 @@
use Utils;
use DateTime;
+use URL;
use Illuminate\Database\Eloquent\SoftDeletes;
use Laracasts\Presenter\PresentableTrait;
use App\Models\BalanceAffecting;
@@ -24,6 +25,13 @@ class Invoice extends EntityModel implements BalanceAffecting
protected $presenter = 'App\Ninja\Presenters\InvoicePresenter';
protected $dates = ['deleted_at'];
+ protected $fillable = [
+ 'tax_name1',
+ 'tax_rate1',
+ 'tax_name2',
+ 'tax_rate2',
+ ];
+
protected $casts = [
'is_recurring' => 'boolean',
'has_tasks' => 'boolean',
@@ -175,6 +183,11 @@ class Invoice extends EntityModel implements BalanceAffecting
return $this->hasMany('App\Models\InvoiceItem')->orderBy('id');
}
+ public function documents()
+ {
+ return $this->hasMany('App\Models\Document')->orderBy('id');
+ }
+
public function invoice_status()
{
return $this->belongsTo('App\Models\InvoiceStatus');
@@ -215,6 +228,12 @@ class Invoice extends EntityModel implements BalanceAffecting
return $this->hasMany('App\Models\Expense','invoice_id','id')->withTrashed();
}
+ public function scopeInvoices($query)
+ {
+ return $query->where('is_quote', '=', false)
+ ->where('is_recurring', '=', false);
+ }
+
public function markInvitationsSent($notify = false)
{
foreach ($this->invitations as $invitation) {
@@ -385,14 +404,18 @@ class Invoice extends EntityModel implements BalanceAffecting
'amount',
'balance',
'invoice_items',
+ 'documents',
+ 'expenses',
'client',
- 'tax_name',
- 'tax_rate',
+ 'tax_name1',
+ 'tax_rate1',
+ 'tax_name2',
+ 'tax_rate2',
'account',
'invoice_design',
'invoice_design_id',
'invoice_fonts',
- 'is_pro',
+ 'features',
'is_quote',
'custom_value1',
'custom_value2',
@@ -419,6 +442,7 @@ class Invoice extends EntityModel implements BalanceAffecting
'contacts',
'country',
'currency_id',
+ 'country_id',
'custom_value1',
'custom_value2',
]);
@@ -457,6 +481,8 @@ class Invoice extends EntityModel implements BalanceAffecting
'custom_invoice_text_label2',
'custom_invoice_item_label1',
'custom_invoice_item_label2',
+ 'invoice_embed_documents',
+ 'page_size',
]);
foreach ($this->invoice_items as $invoiceItem) {
@@ -467,8 +493,10 @@ class Invoice extends EntityModel implements BalanceAffecting
'custom_value2',
'cost',
'qty',
- 'tax_name',
- 'tax_rate',
+ 'tax_name1',
+ 'tax_rate1',
+ 'tax_name2',
+ 'tax_rate2',
]);
}
@@ -481,6 +509,26 @@ class Invoice extends EntityModel implements BalanceAffecting
]);
}
+ foreach ($this->documents as $document) {
+ $document->setVisible([
+ 'public_id',
+ 'name',
+ ]);
+ }
+
+ foreach ($this->expenses as $expense) {
+ $expense->setVisible([
+ 'documents',
+ ]);
+
+ foreach ($expense->documents as $document) {
+ $document->setVisible([
+ 'public_id',
+ 'name',
+ ]);
+ }
+ }
+
return $this;
}
@@ -749,9 +797,8 @@ class Invoice extends EntityModel implements BalanceAffecting
}
$invitation = $this->invitations[0];
- $link = $invitation->getLink();
+ $link = $invitation->getLink('view', true);
$key = env('PHANTOMJS_CLOUD_KEY');
- $curl = curl_init();
if (Utils::isNinjaDev()) {
$link = env('TEST_LINK');
@@ -814,53 +861,79 @@ class Invoice extends EntityModel implements BalanceAffecting
return $total;
}
+ // if $calculatePaid is true we'll loop through each payment to
+ // determine the sum, otherwise we'll use the cached paid_to_date amount
public function getTaxes($calculatePaid = false)
{
$taxes = [];
$taxable = $this->getTaxable();
-
- if ($this->tax_rate && $this->tax_name) {
- $taxAmount = $taxable * ($this->tax_rate / 100);
- $taxAmount = round($taxAmount, 2);
+ $paidAmount = $this->getAmountPaid($calculatePaid);
+
+ if ($this->tax_name1) {
+ $invoiceTaxAmount = round($taxable * ($this->tax_rate1 / 100), 2);
+ $invoicePaidAmount = $this->amount && $invoiceTaxAmount ? ($paidAmount / $this->amount * $invoiceTaxAmount) : 0;
+ $this->calculateTax($taxes, $this->tax_name1, $this->tax_rate1, $invoiceTaxAmount, $invoicePaidAmount);
+ }
- if ($taxAmount) {
- $taxes[$this->tax_name.$this->tax_rate] = [
- 'name' => $this->tax_name,
- 'rate' => $this->tax_rate,
- 'amount' => $taxAmount,
- 'paid' => round($this->getAmountPaid($calculatePaid) / $this->amount * $taxAmount, 2)
- ];
- }
+ if ($this->tax_name2) {
+ $invoiceTaxAmount = round($taxable * ($this->tax_rate2 / 100), 2);
+ $invoicePaidAmount = $this->amount && $invoiceTaxAmount ? ($paidAmount / $this->amount * $invoiceTaxAmount) : 0;
+ $this->calculateTax($taxes, $this->tax_name2, $this->tax_rate2, $invoiceTaxAmount, $invoicePaidAmount);
}
foreach ($this->invoice_items as $invoiceItem) {
- if ( ! $invoiceItem->tax_rate || ! $invoiceItem->tax_name) {
- continue;
+ $itemTaxAmount = $this->getItemTaxable($invoiceItem, $taxable);
+
+ if ($invoiceItem->tax_name1) {
+ $itemTaxAmount = round($taxable * ($invoiceItem->tax_rate1 / 100), 2);
+ $itemPaidAmount = $this->amount && $itemTaxAmount ? ($paidAmount / $this->amount * $itemTaxAmount) : 0;
+ $this->calculateTax($taxes, $invoiceItem->tax_name1, $invoiceItem->tax_rate1, $itemTaxAmount, $itemPaidAmount);
}
- $taxAmount = $this->getItemTaxable($invoiceItem, $taxable);
- $taxAmount = $taxable * ($invoiceItem->tax_rate / 100);
- $taxAmount = round($taxAmount, 2);
-
- if ($taxAmount) {
- $key = $invoiceItem->tax_name.$invoiceItem->tax_rate;
-
- if ( ! isset($taxes[$key])) {
- $taxes[$key] = [
- 'amount' => 0,
- 'paid' => 0
- ];
- }
-
- $taxes[$key]['amount'] += $taxAmount;
- $taxes[$key]['paid'] += $this->amount && $taxAmount ? round($this->getAmountPaid($calculatePaid) / $this->amount * $taxAmount, 2) : 0;
- $taxes[$key]['name'] = $invoiceItem->tax_name;
- $taxes[$key]['rate'] = $invoiceItem->tax_rate;
+ if ($invoiceItem->tax_name2) {
+ $itemTaxAmount = round($taxable * ($invoiceItem->tax_rate2 / 100), 2);
+ $itemPaidAmount = $this->amount && $itemTaxAmount ? ($paidAmount / $this->amount * $itemTaxAmount) : 0;
+ $this->calculateTax($taxes, $invoiceItem->tax_name2, $invoiceItem->tax_rate2, $itemTaxAmount, $itemPaidAmount);
}
}
-
+
return $taxes;
}
+
+ private function calculateTax(&$taxes, $name, $rate, $amount, $paid)
+ {
+ if ( ! $amount) {
+ return;
+ }
+
+ $amount = round($amount, 2);
+ $paid = round($paid, 2);
+ $key = $rate . ' ' . $name;
+
+ if ( ! isset($taxes[$key])) {
+ $taxes[$key] = [
+ 'name' => $name,
+ 'rate' => $rate+0,
+ 'amount' => 0,
+ 'paid' => 0
+ ];
+ }
+
+ $taxes[$key]['amount'] += $amount;
+ $taxes[$key]['paid'] += $paid;
+ }
+
+ public function hasDocuments(){
+ if(count($this->documents))return true;
+ return $this->hasExpenseDocuments();
+ }
+
+ public function hasExpenseDocuments(){
+ foreach($this->expenses as $expense){
+ if(count($expense->documents))return true;
+ }
+ return false;
+ }
}
Invoice::creating(function ($invoice) {
diff --git a/app/Models/InvoiceDesign.php b/app/Models/InvoiceDesign.php
index 2b53ac6383c7..51f15b035ad6 100644
--- a/app/Models/InvoiceDesign.php
+++ b/app/Models/InvoiceDesign.php
@@ -1,4 +1,4 @@
-belongsTo('App\Models\Invoice');
}
+ public function user()
+ {
+ return $this->belongsTo('App\Models\User')->withTrashed();
+ }
+
public function product()
{
return $this->belongsTo('App\Models\Product');
diff --git a/app/Models/Product.php b/app/Models/Product.php
index 4098c67063d2..05944c9fff94 100644
--- a/app/Models/Product.php
+++ b/app/Models/Product.php
@@ -8,6 +8,14 @@ class Product extends EntityModel
use SoftDeletes;
protected $dates = ['deleted_at'];
+ protected $fillable = [
+ 'product_key',
+ 'notes',
+ 'cost',
+ 'qty',
+ 'default_tax_rate_id',
+ ];
+
public function getEntityType()
{
return ENTITY_PRODUCT;
@@ -18,12 +26,13 @@ class Product extends EntityModel
return Product::scope()->where('product_key', '=', $key)->first();
}
+ public function user()
+ {
+ return $this->belongsTo('App\Models\User')->withTrashed();
+ }
+
public function default_tax_rate()
{
return $this->belongsTo('App\Models\TaxRate');
}
-
- public function canEdit() {
- return Auth::user()->hasPermission('admin');
- }
}
diff --git a/app/Models/TaxRate.php b/app/Models/TaxRate.php
index cf0a576a8f0d..384ccf933b36 100644
--- a/app/Models/TaxRate.php
+++ b/app/Models/TaxRate.php
@@ -17,8 +17,9 @@ class TaxRate extends EntityModel
{
return ENTITY_TAX_RATE;
}
-
- public function canEdit() {
- return Auth::user()->hasPermission('admin');
+
+ public function user()
+ {
+ return $this->belongsTo('App\Models\User')->withTrashed();
}
}
diff --git a/app/Models/User.php b/app/Models/User.php
index 1b2ae7815a36..71069d25821c 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -7,20 +7,22 @@ use App\Libraries\Utils;
use App\Events\UserSettingsChanged;
use App\Events\UserSignedUp;
use Illuminate\Auth\Authenticatable;
+use Illuminate\Foundation\Auth\Access\Authorizable;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Auth\Passwords\CanResetPassword;
use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
+use Illuminate\Contracts\Auth\Access\Authorizable as AuthorizableContract;
use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract;
use Illuminate\Database\Eloquent\SoftDeletes;
-class User extends Model implements AuthenticatableContract, CanResetPasswordContract {
+class User extends Model implements AuthenticatableContract, AuthorizableContract, CanResetPasswordContract {
public static $all_permissions = array(
'create_all' => 0b0001,
'view_all' => 0b0010,
'edit_all' => 0b0100,
);
- use Authenticatable, CanResetPassword;
+ use Authenticatable, Authorizable, CanResetPassword;
/**
* The database table used by the model.
@@ -112,9 +114,14 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
return $this->account->isPro();
}
+ public function hasFeature($feature)
+ {
+ return $this->account->hasFeature($feature);
+ }
+
public function isPaidPro()
{
- return $this->isPro() && ! $this->isTrial();
+ return $this->isPro($accountDetails) && !$accountDetails['trial'];
}
public function isTrial()
@@ -122,14 +129,14 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
return $this->account->isTrial();
}
- public function isEligibleForTrial()
+ public function isEligibleForTrial($plan = null)
{
- return $this->account->isEligibleForTrial();
+ return $this->account->isEligibleForTrial($plan);
}
public function maxInvoiceDesignId()
{
- return $this->isPro() ? 11 : (Utils::isNinja() ? COUNT_FREE_DESIGNS : COUNT_FREE_DESIGNS_SELF_HOST);
+ return $this->hasFeature(FEATURE_MORE_INVOICE_DESIGNS) ? 11 : (Utils::isNinja() ? COUNT_FREE_DESIGNS : COUNT_FREE_DESIGNS_SELF_HOST);
}
public function getDisplayName()
@@ -173,7 +180,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
public function getMaxNumClients()
{
- if ($this->isPro() && ! $this->isTrial()) {
+ if ($this->hasFeature(FEATURE_MORE_CLIENTS)) {
return MAX_NUM_CLIENTS_PRO;
}
@@ -186,7 +193,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
public function getMaxNumVendors()
{
- if ($this->isPro() && ! $this->isTrial()) {
+ if ($this->hasFeature(FEATURE_MORE_CLIENTS)) {
return MAX_NUM_VENDORS_PRO;
}
@@ -321,6 +328,10 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon
return false;
}
+
+ public function owns($entity) {
+ return !empty($entity->user_id) && $entity->user_id == $this->id;
+ }
}
User::updating(function ($user) {
diff --git a/app/Models/Vendor.php b/app/Models/Vendor.php
index 573a581e4774..6fcd10f14092 100644
--- a/app/Models/Vendor.php
+++ b/app/Models/Vendor.php
@@ -95,7 +95,7 @@ class Vendor extends EntityModel
return $this->hasMany('App\Models\Payment');
}
- public function vendorContacts()
+ public function vendor_contacts()
{
return $this->hasMany('App\Models\VendorContact');
}
@@ -143,7 +143,7 @@ class Vendor extends EntityModel
$contact->fill($data);
$contact->is_primary = $isPrimary;
- return $this->vendorContacts()->save($contact);
+ return $this->vendor_contacts()->save($contact);
}
public function getRoute()
diff --git a/app/Ninja/Mailers/ContactMailer.php b/app/Ninja/Mailers/ContactMailer.php
index e526300a5dd9..fbebd0c5fdfd 100644
--- a/app/Ninja/Mailers/ContactMailer.php
+++ b/app/Ninja/Mailers/ContactMailer.php
@@ -1,16 +1,13 @@
templateService = $templateService;
+ }
+
public function sendInvoice(Invoice $invoice, $reminder = false, $pdfString = false)
{
$invoice->load('invitations', 'client.language', 'account');
@@ -59,9 +62,32 @@ class ContactMailer extends Mailer
if ($account->attatchPDF() && !$pdfString) {
$pdfString = $invoice->getPDFString();
}
+
+ $documentStrings = array();
+ if ($account->document_email_attachment && $invoice->hasDocuments()) {
+ $documents = $invoice->documents;
+
+ foreach($invoice->expenses as $expense){
+ $documents = $documents->merge($expense->documents);
+ }
+
+ $documents = $documents->sortBy('size');
+
+ $size = 0;
+ $maxSize = MAX_EMAIL_DOCUMENTS_SIZE * 1000;
+ foreach($documents as $document){
+ $size += $document->size;
+ if($size > $maxSize)break;
+
+ $documentStrings[] = array(
+ 'name' => $document->name,
+ 'data' => $document->getRaw(),
+ );
+ }
+ }
foreach ($invoice->invitations as $invitation) {
- $response = $this->sendInvitation($invitation, $invoice, $emailTemplate, $emailSubject, $pdfString);
+ $response = $this->sendInvitation($invitation, $invoice, $emailTemplate, $emailSubject, $pdfString, $documentStrings);
if ($response === true) {
$sent = true;
}
@@ -80,7 +106,7 @@ class ContactMailer extends Mailer
return $response;
}
- private function sendInvitation($invitation, $invoice, $body, $subject, $pdfString)
+ private function sendInvitation($invitation, $invoice, $body, $subject, $pdfString, $documentStrings)
{
$client = $invoice->client;
$account = $invoice->account;
@@ -111,7 +137,7 @@ class ContactMailer extends Mailer
'amount' => $invoice->getRequestedAmount()
];
- if (empty($invitation->contact->password) && $account->isPro() && $account->enable_portal_password && $account->send_portal_password) {
+ if (empty($invitation->contact->password) && $account->hasFeature(FEATURE_CLIENT_PORTAL_PASSWORD) && $account->enable_portal_password && $account->send_portal_password) {
// The contact needs a password
$variables['password'] = $password = $this->generatePassword();
$invitation->contact->password = bcrypt($password);
@@ -119,7 +145,7 @@ class ContactMailer extends Mailer
}
$data = [
- 'body' => $this->processVariables($body, $variables),
+ 'body' => $this->templateService->processVariables($body, $variables),
'link' => $invitation->getLink(),
'entityType' => $invoice->getEntityType(),
'invoiceId' => $invoice->id,
@@ -127,6 +153,7 @@ class ContactMailer extends Mailer
'account' => $account,
'client' => $client,
'invoice' => $invoice,
+ 'documents' => $documentStrings,
];
if ($account->attatchPDF()) {
@@ -134,14 +161,9 @@ class ContactMailer extends Mailer
$data['pdfFileName'] = $invoice->getFileName();
}
- $subject = $this->processVariables($subject, $variables);
+ $subject = $this->templateService->processVariables($subject, $variables);
$fromEmail = $user->email;
-
- if ($account->getEmailDesignId() == EMAIL_DESIGN_PLAIN) {
- $view = ENTITY_INVOICE;
- } else {
- $view = 'design' . ($account->getEmailDesignId() - 1);
- }
+ $view = $account->getTemplateView(ENTITY_INVOICE);
$response = $this->sendTo($invitation->contact->email, $fromEmail, $account->getDisplayName(), $subject, $view, $data);
@@ -204,7 +226,7 @@ class ContactMailer extends Mailer
];
$data = [
- 'body' => $this->processVariables($emailTemplate, $variables),
+ 'body' => $this->templateService->processVariables($emailTemplate, $variables),
'link' => $invitation->getLink(),
'invoice' => $invoice,
'client' => $client,
@@ -218,14 +240,10 @@ class ContactMailer extends Mailer
$data['pdfFileName'] = $invoice->getFileName();
}
- $subject = $this->processVariables($emailSubject, $variables);
+ $subject = $this->templateService->processVariables($emailSubject, $variables);
$data['invoice_id'] = $payment->invoice->id;
- if ($account->getEmailDesignId() == EMAIL_DESIGN_PLAIN) {
- $view = 'payment_confirmation';
- } else {
- $view = 'design' . ($account->getEmailDesignId() - 1);
- }
+ $view = $account->getTemplateView('payment_confirmation');
if ($user->email && $contact->email) {
$this->sendTo($contact->email, $user->email, $accountName, $subject, $view, $data);
@@ -255,60 +273,4 @@ class ContactMailer extends Mailer
$this->sendTo($email, CONTACT_EMAIL, CONTACT_NAME, $subject, $view, $data);
}
-
- private function processVariables($template, $data)
- {
- $account = $data['account'];
- $client = $data['client'];
- $invitation = $data['invitation'];
- $invoice = $invitation->invoice;
- $passwordHTML = isset($data['password'])?'\$account
'.trans('texts.password').': '.$data['password'].'
':false;
-
- $variables = [
- '$footer' => $account->getEmailFooter(),
- '$client' => $client->getDisplayName(),
- '$account' => $account->getDisplayName(),
- '$dueDate' => $account->formatDate($invoice->due_date),
- '$invoiceDate' => $account->formatDate($invoice->invoice_date),
- '$contact' => $invitation->contact->getDisplayName(),
- '$firstName' => $invitation->contact->first_name,
- '$amount' => $account->formatMoney($data['amount'], $client),
- '$invoice' => $invoice->invoice_number,
- '$quote' => $invoice->invoice_number,
- '$link' => $invitation->getLink(),
- '$password' => $passwordHTML,
- '$viewLink' => $invitation->getLink().'$password',
- '$viewButton' => Form::emailViewButton($invitation->getLink(), $invoice->getEntityType()).'$password',
- '$paymentLink' => $invitation->getLink('payment').'$password',
- '$paymentButton' => Form::emailPaymentButton($invitation->getLink('payment')).'$password',
- '$customClient1' => $account->custom_client_label1,
- '$customClient2' => $account->custom_client_label2,
- '$customInvoice1' => $account->custom_invoice_text_label1,
- '$customInvoice2' => $account->custom_invoice_text_label2,
- ];
-
- // Add variables for available payment types
- foreach (Gateway::$paymentTypes as $type) {
- $camelType = Gateway::getPaymentTypeName($type);
- $type = Utils::toSnakeCase($camelType);
- $variables["\${$camelType}Link"] = $invitation->getLink('payment') . "/{$type}";
- $variables["\${$camelType}Button"] = Form::emailPaymentButton($invitation->getLink('payment') . "/{$type}");
- }
-
- $includesPasswordPlaceholder = strpos($template, '$password') !== false;
-
- $str = str_replace(array_keys($variables), array_values($variables), $template);
-
- if(!$includesPasswordPlaceholder && $passwordHTML){
- $pos = strrpos($str, '$password');
- if($pos !== false)
- {
- $str = substr_replace($str, $passwordHTML, $pos, 9/* length of "$password" */);
- }
- }
- $str = str_replace('$password', '', $str);
- $str = autolink($str, 100);
-
- return $str;
- }
}
diff --git a/app/Ninja/Mailers/Mailer.php b/app/Ninja/Mailers/Mailer.php
index 7afcc2548c93..d655e4945e31 100644
--- a/app/Ninja/Mailers/Mailer.php
+++ b/app/Ninja/Mailers/Mailer.php
@@ -44,6 +44,13 @@ class Mailer
if (!empty($data['pdfString']) && !empty($data['pdfFileName'])) {
$message->attachData($data['pdfString'], $data['pdfFileName']);
}
+
+ // Attach documents to the email
+ if(!empty($data['documents'])){
+ foreach($data['documents'] as $document){
+ $message->attachData($document['data'], $document['name']);
+ }
+ }
});
return $this->handleSuccess($response, $data);
diff --git a/app/Ninja/Presenters/ExpensePresenter.php b/app/Ninja/Presenters/ExpensePresenter.php
index 6b66080ded85..1980480a2f53 100644
--- a/app/Ninja/Presenters/ExpensePresenter.php
+++ b/app/Ninja/Presenters/ExpensePresenter.php
@@ -16,14 +16,9 @@ class ExpensePresenter extends Presenter {
return Utils::fromSqlDate($this->entity->expense_date);
}
- public function converted_amount()
- {
- return round($this->entity->amount * $this->entity->exchange_rate, 2);
- }
-
public function invoiced_amount()
{
- return $this->entity->invoice_id ? $this->converted_amount() : 0;
+ return $this->entity->invoice_id ? $this->entity->convertedAmount() : 0;
}
public function link()
diff --git a/app/Ninja/Presenters/InvoicePresenter.php b/app/Ninja/Presenters/InvoicePresenter.php
index ebb3297d5c1a..36a2ce2acbd6 100644
--- a/app/Ninja/Presenters/InvoicePresenter.php
+++ b/app/Ninja/Presenters/InvoicePresenter.php
@@ -18,7 +18,7 @@ class InvoicePresenter extends Presenter {
public function balanceDueLabel()
{
- if ($this->entity->partial) {
+ if ($this->entity->partial > 0) {
return 'partial_due';
} elseif ($this->entity->is_quote) {
return 'total';
diff --git a/app/Ninja/Repositories/AccountRepository.php b/app/Ninja/Repositories/AccountRepository.php
index 0e08fbba5d06..38753dde9b9a 100644
--- a/app/Ninja/Repositories/AccountRepository.php
+++ b/app/Ninja/Repositories/AccountRepository.php
@@ -17,6 +17,7 @@ use App\Models\Client;
use App\Models\Language;
use App\Models\Contact;
use App\Models\Account;
+use App\Models\Company;
use App\Models\User;
use App\Models\UserAccount;
use App\Models\AccountToken;
@@ -25,9 +26,13 @@ class AccountRepository
{
public function create($firstName = '', $lastName = '', $email = '', $password = '')
{
+ $company = new Company();
+ $company->save();
+
$account = new Account();
$account->ip = Request::getClientIp();
$account->account_key = str_random(RANDOM_KEY_LENGTH);
+ $account->company_id = $company->id;
// Track referal code
if ($referralCode = Session::get(SESSION_REFERRAL_CODE)) {
@@ -70,17 +75,19 @@ class AccountRepository
return $account;
}
- public function getSearchData($account)
+ public function getSearchData($user)
{
- $data = $this->getAccountSearchData($account);
+ $data = $this->getAccountSearchData($user);
- $data['navigation'] = $this->getNavigationSearchData();
+ $data['navigation'] = $user->is_admin ? $this->getNavigationSearchData() : [];
return $data;
}
- private function getAccountSearchData($account)
+ private function getAccountSearchData($user)
{
+ $account = $user->account;
+
$data = [
'clients' => [],
'contacts' => [],
@@ -95,11 +102,19 @@ class AccountRepository
if ($account->custom_client_label2) {
$data[$account->custom_client_label2] = [];
}
-
- $clients = Client::scope()
- ->with('contacts', 'invoices')
- ->get();
-
+
+ if ($user->hasPermission('view_all')) {
+ $clients = Client::scope()
+ ->with('contacts', 'invoices')
+ ->get();
+ } else {
+ $clients = Client::scope()
+ ->where('user_id', '=', $user->id)
+ ->with(['contacts', 'invoices' => function($query) use ($user) {
+ $query->where('user_id', '=', $user->id);
+ }])->get();
+ }
+
foreach ($clients as $client) {
if ($client->name) {
$data['clients'][] = [
@@ -162,6 +177,7 @@ class AccountRepository
ENTITY_QUOTE,
ENTITY_TASK,
ENTITY_EXPENSE,
+ ENTITY_VENDOR,
ENTITY_RECURRING_INVOICE,
ENTITY_PAYMENT,
ENTITY_CREDIT
@@ -178,15 +194,22 @@ class AccountRepository
];
}
- $features[] = ['dashboard', '/dashboard'];
- $features[] = ['customize_design', '/settings/customize_design'];
- $features[] = ['new_tax_rate', '/tax_rates/create'];
- $features[] = ['new_product', '/products/create'];
- $features[] = ['new_user', '/users/create'];
- $features[] = ['custom_fields', '/settings/invoice_settings'];
+ $features = array_merge($features, [
+ ['dashboard', '/dashboard'],
+ ['customize_design', '/settings/customize_design'],
+ ['new_tax_rate', '/tax_rates/create'],
+ ['new_product', '/products/create'],
+ ['new_user', '/users/create'],
+ ['custom_fields', '/settings/invoice_settings'],
+ ['invoice_number', '/settings/invoice_settings'],
+ ]);
$settings = array_merge(Account::$basicSettings, Account::$advancedSettings);
+ if ( ! Utils::isNinjaProd()) {
+ $settings[] = ACCOUNT_SYSTEM_SETTINGS;
+ }
+
foreach ($settings as $setting) {
$features[] = [
$setting,
@@ -205,21 +228,23 @@ class AccountRepository
return $data;
}
- public function enableProPlan()
+ public function enablePlan($plan = PLAN_PRO, $term = PLAN_TERM_MONTHLY, $credit = 0, $pending_monthly = false)
{
- if (Auth::user()->isPro() && ! Auth::user()->isTrial()) {
- return false;
- }
-
$account = Auth::user()->account;
$client = $this->getNinjaClient($account);
- $invitation = $this->createNinjaInvoice($client, $account);
+ $invitation = $this->createNinjaInvoice($client, $account, $plan, $term, $credit, $pending_monthly);
return $invitation;
}
- public function createNinjaInvoice($client, $clientAccount)
+ public function createNinjaInvoice($client, $clientAccount, $plan = PLAN_PRO, $term = PLAN_TERM_MONTHLY, $credit = 0, $pending_monthly = false)
{
+ if ($credit < 0) {
+ $credit = 0;
+ }
+
+ $plan_cost = Account::$plan_prices[$plan][$term];
+
$account = $this->getNinjaAccount();
$lastInvoice = Invoice::withTrashed()->whereAccountId($account->id)->orderBy('public_id', 'DESC')->first();
$publicId = $lastInvoice ? ($lastInvoice->public_id + 1) : 1;
@@ -230,19 +255,39 @@ class AccountRepository
$invoice->client_id = $client->id;
$invoice->invoice_number = $account->getNextInvoiceNumber($invoice);
$invoice->invoice_date = $clientAccount->getRenewalDate();
- $invoice->amount = PRO_PLAN_PRICE;
- $invoice->balance = PRO_PLAN_PRICE;
+ $invoice->amount = $invoice->balance = $plan_cost - $credit;
$invoice->save();
- $item = new InvoiceItem();
- $item->account_id = $account->id;
- $item->user_id = $account->users()->first()->id;
- $item->public_id = $publicId;
+ if ($credit) {
+ $credit_item = InvoiceItem::createNew($invoice);
+ $credit_item->qty = 1;
+ $credit_item->cost = -$credit;
+ $credit_item->notes = trans('texts.plan_credit_description');
+ $credit_item->product_key = trans('texts.plan_credit_product');
+ $invoice->invoice_items()->save($credit_item);
+ }
+
+ $item = InvoiceItem::createNew($invoice);
$item->qty = 1;
- $item->cost = PRO_PLAN_PRICE;
- $item->notes = trans('texts.pro_plan_description');
- $item->product_key = trans('texts.pro_plan_product');
+ $item->cost = $plan_cost;
+ $item->notes = trans("texts.{$plan}_plan_{$term}_description");
+
+ // Don't change this without updating the regex in PaymentService->createPayment()
+ $item->product_key = 'Plan - '.ucfirst($plan).' ('.ucfirst($term).')';
$invoice->invoice_items()->save($item);
+
+ if ($pending_monthly) {
+ $term_end = $term == PLAN_MONTHLY ? date_create('+1 month') : date_create('+1 year');
+ $pending_monthly_item = InvoiceItem::createNew($invoice);
+ $item->qty = 1;
+ $pending_monthly_item->cost = 0;
+ $pending_monthly_item->notes = trans("texts.plan_pending_monthly", array('date', Utils::dateToString($term_end)));
+
+ // Don't change this without updating the text in PaymentService->createPayment()
+ $pending_monthly_item->product_key = 'Pending Monthly';
+ $invoice->invoice_items()->save($pending_monthly_item);
+ }
+
$invitation = new Invitation();
$invitation->account_id = $account->id;
@@ -298,28 +343,42 @@ class AccountRepository
{
$account->load('users');
$ninjaAccount = $this->getNinjaAccount();
- $client = Client::whereAccountId($ninjaAccount->id)->wherePublicId($account->id)->first();
+ $ninjaUser = $ninjaAccount->getPrimaryUser();
+ $client = Client::whereAccountId($ninjaAccount->id)
+ ->wherePublicId($account->id)
+ ->first();
+ $clientExists = $client ? true : false;
if (!$client) {
$client = new Client();
$client->public_id = $account->id;
- $client->user_id = $ninjaAccount->users()->first()->id;
+ $client->account_id = $ninjaAccount->id;
+ $client->user_id = $ninjaUser->id;
$client->currency_id = 1;
- foreach (['name', 'address1', 'address2', 'city', 'state', 'postal_code', 'country_id', 'work_phone', 'language_id'] as $field) {
- $client->$field = $account->$field;
- }
- $ninjaAccount->clients()->save($client);
+ }
+
+ foreach (['name', 'address1', 'address2', 'city', 'state', 'postal_code', 'country_id', 'work_phone', 'language_id', 'vat_number'] as $field) {
+ $client->$field = $account->$field;
+ }
+
+ $client->save();
+ if ($clientExists) {
+ $contact = $client->getPrimaryContact();
+ } else {
$contact = new Contact();
- $contact->user_id = $ninjaAccount->users()->first()->id;
+ $contact->user_id = $ninjaUser->id;
$contact->account_id = $ninjaAccount->id;
$contact->public_id = $account->id;
$contact->is_primary = true;
- foreach (['first_name', 'last_name', 'email', 'phone'] as $field) {
- $contact->$field = $account->users()->first()->$field;
- }
- $client->contacts()->save($contact);
}
+
+ $user = $account->getPrimaryUser();
+ foreach (['first_name', 'last_name', 'email', 'phone'] as $field) {
+ $contact->$field = $user->$field;
+ }
+
+ $client->contacts()->save($contact);
return $client;
}
@@ -355,7 +414,7 @@ class AccountRepository
$user->last_name = $lastName;
$user->registered = true;
- $user->account->startTrial();
+ $user->account->startTrial(PLAN_PRO);
}
$user->oauth_provider_id = $providerId;
@@ -471,11 +530,11 @@ class AccountRepository
$item = new stdClass();
$item->id = $record->id;
$item->user_id = $user->id;
+ $item->public_id = $user->public_id;
$item->user_name = $user->getDisplayName();
$item->account_id = $user->account->id;
$item->account_name = $user->account->getDisplayName();
- $item->pro_plan_paid = $user->account->pro_plan_paid;
- $item->logo_path = $user->account->hasLogo() ? $user->account->getLogoPath() : null;
+ $item->logo_url = $user->account->hasLogo() ? $user->account->getLogoUrl() : null;
$data[] = $item;
}
@@ -487,43 +546,6 @@ class AccountRepository
return self::prepareUsersData($record);
}
- public function syncAccounts($userId, $proPlanPaid) {
- $users = self::loadAccounts($userId);
- self::syncUserAccounts($users, $proPlanPaid);
- }
-
- public function syncUserAccounts($users, $proPlanPaid = false) {
- if (!$users) {
- return;
- }
-
- if (!$proPlanPaid) {
- foreach ($users as $user) {
- if ($user->pro_plan_paid && $user->pro_plan_paid != '0000-00-00') {
- $proPlanPaid = $user->pro_plan_paid;
- break;
- }
- }
- }
-
- if (!$proPlanPaid) {
- return;
- }
-
- $accountIds = [];
- foreach ($users as $user) {
- if ($user->pro_plan_paid != $proPlanPaid) {
- $accountIds[] = $user->account_id;
- }
- }
-
- if (count($accountIds)) {
- DB::table('accounts')
- ->whereIn('id', $accountIds)
- ->update(['pro_plan_paid' => $proPlanPaid]);
- }
- }
-
public function associateAccounts($userId1, $userId2) {
$record = self::findUserAccounts($userId1, $userId2);
@@ -542,8 +564,59 @@ class AccountRepository
$record->save();
- $users = self::prepareUsersData($record);
- self::syncUserAccounts($users);
+ $users = $this->getUserAccounts($record);
+
+ // Pick the primary user
+ foreach ($users as $user) {
+ if (!$user->public_id) {
+ $useAsPrimary = false;
+ if(empty($primaryUser)) {
+ $useAsPrimary = true;
+ }
+
+ $planDetails = $user->account->getPlanDetails(false, false);
+ $planLevel = 0;
+
+ if ($planDetails) {
+ $planLevel = 1;
+ if ($planDetails['plan'] == PLAN_ENTERPRISE) {
+ $planLevel = 2;
+ }
+
+ if (!$useAsPrimary && (
+ $planLevel > $primaryUserPlanLevel
+ || ($planLevel == $primaryUserPlanLevel && $planDetails['expires'] > $primaryUserPlanExpires)
+ )) {
+ $useAsPrimary = true;
+ }
+ }
+
+ if ($useAsPrimary) {
+ $primaryUser = $user;
+ $primaryUserPlanLevel = $planLevel;
+ if ($planDetails) {
+ $primaryUserPlanExpires = $planDetails['expires'];
+ }
+ }
+ }
+ }
+
+ // Merge other companies into the primary user's company
+ if (!empty($primaryUser)) {
+ foreach ($users as $user) {
+ if ($user == $primaryUser || $user->public_id) {
+ continue;
+ }
+
+ if ($user->account->company_id != $primaryUser->account->company_id) {
+ foreach ($user->account->company->accounts as $account) {
+ $account->company_id = $primaryUser->account->company_id;
+ $account->save();
+ }
+ $user->account->company->forceDelete();
+ }
+ }
+ }
return $users;
}
@@ -563,6 +636,15 @@ class AccountRepository
$userAccount->removeUserId($userId);
$userAccount->save();
}
+
+ $user = User::whereId($userId)->first();
+
+ if (!$user->public_id && $user->account->company->accounts->count() > 1) {
+ $company = Company::create();
+ $company->save();
+ $user->account->company_id = $company->id;
+ $user->account->save();
+ }
}
public function findWithReminders()
@@ -586,7 +668,7 @@ class AccountRepository
{
$name = trim($name) ?: 'TOKEN';
$users = $this->findUsers($user);
-
+
foreach ($users as $user) {
if ($token = AccountToken::whereUserId($user->id)->whereName($name)->first()) {
continue;
diff --git a/app/Ninja/Repositories/ClientRepository.php b/app/Ninja/Repositories/ClientRepository.php
index 9df81663a5e5..83f08cd97a59 100644
--- a/app/Ninja/Repositories/ClientRepository.php
+++ b/app/Ninja/Repositories/ClientRepository.php
@@ -66,16 +66,19 @@ class ClientRepository extends BaseRepository
return $query;
}
- public function save($data)
+ public function save($data, $client = null)
{
$publicId = isset($data['public_id']) ? $data['public_id'] : false;
- if (!$publicId || $publicId == '-1') {
+ if ($client) {
+ // do nothing
+ } elseif (!$publicId || $publicId == '-1') {
$client = Client::createNew();
} else {
$client = Client::scope($publicId)->with('contacts')->firstOrFail();
+ \Log::warning('Entity not set in client repo save');
}
-
+
// convert currency code to id
if (isset($data['currency_code'])) {
$currencyCode = strtolower($data['currency_code']);
@@ -100,6 +103,11 @@ class ClientRepository extends BaseRepository
$contacts = isset($data['contact']) ? [$data['contact']] : $data['contacts'];
$contactIds = [];
+ // If the primary is set ensure it's listed first
+ usort($contacts, function ($left, $right) {
+ return (isset($right['is_primary']) ? $right['is_primary'] : 1) - (isset($left['is_primary']) ? $left['is_primary'] : 0);
+ });
+
foreach ($contacts as $contact) {
$contact = $client->addContact($contact, $first);
$contactIds[] = $contact->public_id;
diff --git a/app/Ninja/Repositories/CreditRepository.php b/app/Ninja/Repositories/CreditRepository.php
index 9803b4628af8..068707ace02b 100644
--- a/app/Ninja/Repositories/CreditRepository.php
+++ b/app/Ninja/Repositories/CreditRepository.php
@@ -27,7 +27,7 @@ class CreditRepository extends BaseRepository
DB::raw('COALESCE(clients.currency_id, accounts.currency_id) currency_id'),
DB::raw('COALESCE(clients.country_id, accounts.country_id) country_id'),
'credits.public_id',
- 'clients.name as client_name',
+ DB::raw("COALESCE(NULLIF(clients.name,''), NULLIF(CONCAT(contacts.first_name, ' ', contacts.last_name),''), NULLIF(contacts.email,'')) client_name"),
'clients.public_id as client_public_id',
'clients.user_id as client_user_id',
'credits.amount',
@@ -59,12 +59,15 @@ class CreditRepository extends BaseRepository
return $query;
}
- public function save($input)
+ public function save($input, $credit = null)
{
$publicId = isset($data['public_id']) ? $data['public_id'] : false;
-
- if ($publicId) {
+
+ if ($credit) {
+ // do nothing
+ } elseif ($publicId) {
$credit = Credit::scope($publicId)->firstOrFail();
+ \Log::warning('Entity not set in credit repo save');
} else {
$credit = Credit::createNew();
}
diff --git a/app/Ninja/Repositories/DocumentRepository.php b/app/Ninja/Repositories/DocumentRepository.php
new file mode 100644
index 000000000000..094b4848ebe0
--- /dev/null
+++ b/app/Ninja/Repositories/DocumentRepository.php
@@ -0,0 +1,228 @@
+with('user')
+ ->get();
+ }
+
+ public function find()
+ {
+ $accountid = \Auth::user()->account_id;
+ $query = DB::table('clients')
+ ->join('accounts', 'accounts.id', '=', 'clients.account_id')
+ ->leftjoin('clients', 'clients.id', '=', 'clients.client_id')
+ /*->leftJoin('expenses', 'expenses.id', '=', 'clients.expense_id')
+ ->leftJoin('invoices', 'invoices.id', '=', 'clients.invoice_id')*/
+ ->where('documents.account_id', '=', $accountid)
+ /*->where('vendors.deleted_at', '=', null)
+ ->where('clients.deleted_at', '=', null)*/
+ ->select(
+ 'documents.account_id',
+ 'documents.path',
+ 'documents.deleted_at',
+ 'documents.size',
+ 'documents.width',
+ 'documents.height',
+ 'documents.id',
+ 'documents.is_deleted',
+ 'documents.public_id',
+ 'documents.invoice_id',
+ 'documents.expense_id',
+ 'documents.user_id',
+ 'invoices.public_id as invoice_public_id',
+ 'invoices.user_id as invoice_user_id',
+ 'expenses.public_id as expense_public_id',
+ 'expenses.user_id as expense_user_id'
+ );
+
+ return $query;
+ }
+
+ public function upload($uploaded, &$doc_array=null)
+ {
+ $extension = strtolower($uploaded->getClientOriginalExtension());
+ if(empty(Document::$types[$extension]) && !empty(Document::$extraExtensions[$extension])){
+ $documentType = Document::$extraExtensions[$extension];
+ }
+ else{
+ $documentType = $extension;
+ }
+
+ if(empty(Document::$types[$documentType])){
+ return 'Unsupported file type';
+ }
+
+ $documentTypeData = Document::$types[$documentType];
+
+ $filePath = $uploaded->path();
+ $name = $uploaded->getClientOriginalName();
+ $size = filesize($filePath);
+
+ if($size/1000 > MAX_DOCUMENT_SIZE){
+ return 'File too large';
+ }
+
+
+
+ $hash = sha1_file($filePath);
+ $filename = \Auth::user()->account->account_key.'/'.$hash.'.'.$documentType;
+
+ $document = Document::createNew();
+ $disk = $document->getDisk();
+ if(!$disk->exists($filename)){// Have we already stored the same file
+ $stream = fopen($filePath, 'r');
+ $disk->getDriver()->putStream($filename, $stream, ['mimetype'=>$documentTypeData['mime']]);
+ fclose($stream);
+ }
+
+ // This is an image; check if we need to create a preview
+ if(in_array($documentType, array('jpeg','png','gif','bmp','tiff','psd'))){
+ $makePreview = false;
+ $imageSize = getimagesize($filePath);
+ $width = $imageSize[0];
+ $height = $imageSize[1];
+ $imgManagerConfig = array();
+ if(in_array($documentType, array('gif','bmp','tiff','psd'))){
+ // Needs to be converted
+ $makePreview = true;
+ } else if($width > DOCUMENT_PREVIEW_SIZE || $height > DOCUMENT_PREVIEW_SIZE){
+ $makePreview = true;
+ }
+
+ if(in_array($documentType,array('bmp','tiff','psd'))){
+ if(!class_exists('Imagick')){
+ // Cant't read this
+ $makePreview = false;
+ } else {
+ $imgManagerConfig['driver'] = 'imagick';
+ }
+ }
+
+ if($makePreview){
+ $previewType = 'jpeg';
+ if(in_array($documentType, array('png','gif','tiff','psd'))){
+ // Has transparency
+ $previewType = 'png';
+ }
+
+ $document->preview = \Auth::user()->account->account_key.'/'.$hash.'.'.$documentType.'.x'.DOCUMENT_PREVIEW_SIZE.'.'.$previewType;
+ if(!$disk->exists($document->preview)){
+ // We haven't created a preview yet
+ $imgManager = new ImageManager($imgManagerConfig);
+
+ $img = $imgManager->make($filePath);
+
+ if($width <= DOCUMENT_PREVIEW_SIZE && $height <= DOCUMENT_PREVIEW_SIZE){
+ $previewWidth = $width;
+ $previewHeight = $height;
+ } else if($width > $height) {
+ $previewWidth = DOCUMENT_PREVIEW_SIZE;
+ $previewHeight = $height * DOCUMENT_PREVIEW_SIZE / $width;
+ } else {
+ $previewHeight = DOCUMENT_PREVIEW_SIZE;
+ $previewWidth = $width * DOCUMENT_PREVIEW_SIZE / $height;
+ }
+
+ $img->resize($previewWidth, $previewHeight);
+
+ $previewContent = (string) $img->encode($previewType);
+ $disk->put($document->preview, $previewContent);
+ $base64 = base64_encode($previewContent);
+ }
+ else{
+ $base64 = base64_encode($disk->get($document->preview));
+ }
+ }else{
+ $base64 = base64_encode(file_get_contents($filePath));
+ }
+ }
+
+ $document->path = $filename;
+ $document->type = $documentType;
+ $document->size = $size;
+ $document->hash = $hash;
+ $document->name = substr($name, -255);
+
+ if(!empty($imageSize)){
+ $document->width = $imageSize[0];
+ $document->height = $imageSize[1];
+ }
+
+ $document->save();
+ $doc_array = $document->toArray();
+
+ if(!empty($base64)){
+ $mime = Document::$types[!empty($previewType)?$previewType:$documentType]['mime'];
+ $doc_array['base64'] = 'data:'.$mime.';base64,'.$base64;
+ }
+
+ return $document;
+ }
+
+ public function getClientDatatable($contactId, $entityType, $search)
+ {
+
+ $query = DB::table('invitations')
+ ->join('accounts', 'accounts.id', '=', 'invitations.account_id')
+ ->join('invoices', 'invoices.id', '=', 'invitations.invoice_id')
+ ->join('documents', 'documents.invoice_id', '=', 'invitations.invoice_id')
+ ->join('clients', 'clients.id', '=', 'invoices.client_id')
+ ->where('invitations.contact_id', '=', $contactId)
+ ->where('invitations.deleted_at', '=', null)
+ ->where('invoices.is_deleted', '=', false)
+ ->where('clients.deleted_at', '=', null)
+ ->where('invoices.is_recurring', '=', false)
+ // This needs to be a setting to also hide the activity on the dashboard page
+ //->where('invoices.invoice_status_id', '>=', INVOICE_STATUS_SENT)
+ ->select(
+ 'invitations.invitation_key',
+ 'invoices.invoice_number',
+ 'documents.name',
+ 'documents.public_id',
+ 'documents.created_at',
+ 'documents.size'
+ );
+
+ $table = \Datatable::query($query)
+ ->addColumn('invoice_number', function ($model) {
+ return link_to(
+ '/view/'.$model->invitation_key,
+ $model->invoice_number
+ )->toHtml();
+ })
+ ->addColumn('name', function ($model) {
+ return link_to(
+ '/client/documents/'.$model->invitation_key.'/'.$model->public_id.'/'.$model->name,
+ $model->name,
+ ['target'=>'_blank']
+ )->toHtml();
+ })
+ ->addColumn('document_date', function ($model) {
+ return Utils::fromSqlDate($model->created_at);
+ })
+ ->addColumn('document_size', function ($model) {
+ return Form::human_filesize($model->size);
+ });
+
+ return $table->make();
+ }
+}
diff --git a/app/Ninja/Repositories/ExpenseRepository.php b/app/Ninja/Repositories/ExpenseRepository.php
index 49988435e598..442af74bd32b 100644
--- a/app/Ninja/Repositories/ExpenseRepository.php
+++ b/app/Ninja/Repositories/ExpenseRepository.php
@@ -1,20 +1,29 @@
-documentRepo = $documentRepo;
+ }
+
public function all()
{
return Expense::scope()
@@ -87,7 +96,7 @@ class ExpenseRepository extends BaseRepository
'vendors.name as vendor_name',
'vendors.public_id as vendor_public_id',
'vendors.user_id as vendor_user_id',
- 'clients.name as client_name',
+ DB::raw("COALESCE(NULLIF(clients.name,''), NULLIF(CONCAT(contacts.first_name, ' ', contacts.last_name),''), NULLIF(contacts.email,'')) client_name"),
'clients.public_id as client_public_id',
'clients.user_id as client_user_id',
'contacts.first_name',
@@ -113,12 +122,15 @@ class ExpenseRepository extends BaseRepository
return $query;
}
- public function save($input)
+ public function save($input, $expense = null)
{
$publicId = isset($input['public_id']) ? $input['public_id'] : false;
- if ($publicId) {
+ if ($expense) {
+ // do nothing
+ } elseif ($publicId) {
$expense = Expense::scope($publicId)->firstOrFail();
+ \Log::warning('Entity not set in expense repo save');
} else {
$expense = Expense::createNew();
}
@@ -144,9 +156,46 @@ class ExpenseRepository extends BaseRepository
$rate = isset($input['exchange_rate']) ? Utils::parseFloat($input['exchange_rate']) : 1;
$expense->exchange_rate = round($rate, 4);
$expense->amount = round(Utils::parseFloat($input['amount']), 2);
-
+
$expense->save();
+ // Documents
+ $document_ids = !empty($input['document_ids'])?array_map('intval', $input['document_ids']):array();;
+ foreach ($document_ids as $document_id){
+ $document = Document::scope($document_id)->first();
+ if($document && Auth::user()->can('edit', $document)){
+ $document->invoice_id = null;
+ $document->expense_id = $expense->id;
+ $document->save();
+ }
+ }
+
+ if(!empty($input['documents']) && Auth::user()->can('create', ENTITY_DOCUMENT)){
+ // Fallback upload
+ $doc_errors = array();
+ foreach($input['documents'] as $upload){
+ $result = $this->documentRepo->upload($upload);
+ if(is_string($result)){
+ $doc_errors[] = $result;
+ }
+ else{
+ $result->expense_id = $expense->id;
+ $result->save();
+ $document_ids[] = $result->public_id;
+ }
+ }
+ if(!empty($doc_errors)){
+ Session::flash('error', implode('
',array_map('htmlentities',$doc_errors)));
+ }
+ }
+
+ foreach ($expense->documents as $document){
+ if(!in_array($document->public_id, $document_ids)){
+ // Not checking permissions; deleting a document is just editing the invoice
+ $document->delete();
+ }
+ }
+
return $expense;
}
diff --git a/app/Ninja/Repositories/InvoiceRepository.php b/app/Ninja/Repositories/InvoiceRepository.php
index 67c0bab31080..91ffddfea138 100644
--- a/app/Ninja/Repositories/InvoiceRepository.php
+++ b/app/Ninja/Repositories/InvoiceRepository.php
@@ -1,25 +1,31 @@
-documentRepo = $documentRepo;
$this->paymentService = $paymentService;
}
@@ -52,7 +58,7 @@ class InvoiceRepository extends BaseRepository
'clients.user_id as client_user_id',
'invoice_number',
'invoice_status_id',
- 'clients.name as client_name',
+ DB::raw("COALESCE(NULLIF(clients.name,''), NULLIF(CONCAT(contacts.first_name, ' ', contacts.last_name),''), NULLIF(contacts.email,'')) client_name"),
'invoices.public_id',
'invoices.amount',
'invoices.balance',
@@ -109,7 +115,7 @@ class InvoiceRepository extends BaseRepository
DB::raw('COALESCE(clients.currency_id, accounts.currency_id) currency_id'),
DB::raw('COALESCE(clients.country_id, accounts.country_id) country_id'),
'clients.public_id as client_public_id',
- 'clients.name as client_name',
+ DB::raw("COALESCE(NULLIF(clients.name,''), NULLIF(CONCAT(contacts.first_name, ' ', contacts.last_name),''), NULLIF(contacts.email,'')) client_name"),
'invoices.public_id',
'invoices.amount',
'frequencies.name as frequency',
@@ -119,7 +125,8 @@ class InvoiceRepository extends BaseRepository
'contacts.last_name',
'contacts.email',
'invoices.deleted_at',
- 'invoices.is_deleted'
+ 'invoices.is_deleted',
+ 'invoices.user_id'
);
if ($clientPublicId) {
@@ -146,11 +153,14 @@ class InvoiceRepository extends BaseRepository
->join('accounts', 'accounts.id', '=', 'invitations.account_id')
->join('invoices', 'invoices.id', '=', 'invitations.invoice_id')
->join('clients', 'clients.id', '=', 'invoices.client_id')
+ ->join('contacts', 'contacts.client_id', '=', 'clients.id')
->where('invitations.contact_id', '=', $contactId)
->where('invitations.deleted_at', '=', null)
->where('invoices.is_quote', '=', $entityType == ENTITY_QUOTE)
->where('invoices.is_deleted', '=', false)
->where('clients.deleted_at', '=', null)
+ ->where('contacts.deleted_at', '=', null)
+ ->where('contacts.is_primary', '=', true)
->where('invoices.is_recurring', '=', false)
// This needs to be a setting to also hide the activity on the dashboard page
//->where('invoices.invoice_status_id', '>=', INVOICE_STATUS_SENT)
@@ -163,7 +173,7 @@ class InvoiceRepository extends BaseRepository
'invoices.balance as balance',
'invoices.due_date',
'clients.public_id as client_public_id',
- 'clients.name as client_name',
+ DB::raw("COALESCE(NULLIF(clients.name,''), NULLIF(CONCAT(contacts.first_name, ' ', contacts.last_name),''), NULLIF(contacts.email,'')) client_name"),
'invoices.public_id',
'invoices.amount',
'invoices.start_date',
@@ -191,14 +201,16 @@ class InvoiceRepository extends BaseRepository
->make();
}
- public function save($data, $checkSubPermissions = false)
+ public function save($data, $invoice = null)
{
$account = \Auth::user()->account;
$publicId = isset($data['public_id']) ? $data['public_id'] : false;
$isNew = !$publicId || $publicId == '-1';
- if ($isNew) {
+ if ($invoice) {
+ // do nothing
+ } elseif ($isNew) {
$entityType = ENTITY_INVOICE;
if (isset($data['is_recurring']) && filter_var($data['is_recurring'], FILTER_VALIDATE_BOOLEAN)) {
$entityType = ENTITY_RECURRING_INVOICE;
@@ -214,8 +226,11 @@ class InvoiceRepository extends BaseRepository
}
} else {
$invoice = Invoice::scope($publicId)->firstOrFail();
+ \Log::warning('Entity not set in invoice repo save');
}
+ $invoice->fill($data);
+
if ((isset($data['set_default_terms']) && $data['set_default_terms'])
|| (isset($data['set_default_footer']) && $data['set_default_footer'])) {
if (isset($data['set_default_terms']) && $data['set_default_terms']) {
@@ -277,14 +292,23 @@ class InvoiceRepository extends BaseRepository
$invoice->end_date = null;
}
- $invoice->terms = (isset($data['terms']) && trim($data['terms'])) ? trim($data['terms']) : (!$publicId && $account->invoice_terms ? $account->invoice_terms : '');
+ if (isset($data['terms']) && trim($data['terms'])) {
+ $invoice->terms = trim($data['terms']);
+ } elseif ($isNew && $account->{"{$entityType}_terms"}) {
+ $invoice->terms = $account->{"{$entityType}_terms"};
+ } else {
+ $invoice->terms = '';
+ }
+
$invoice->invoice_footer = (isset($data['invoice_footer']) && trim($data['invoice_footer'])) ? trim($data['invoice_footer']) : (!$publicId && $account->invoice_footer ? $account->invoice_footer : '');
$invoice->public_notes = isset($data['public_notes']) ? trim($data['public_notes']) : null;
- // process date variables
- $invoice->terms = Utils::processVariables($invoice->terms);
- $invoice->invoice_footer = Utils::processVariables($invoice->invoice_footer);
- $invoice->public_notes = Utils::processVariables($invoice->public_notes);
+ // process date variables if not recurring
+ if(!$invoice->is_recurring) {
+ $invoice->terms = Utils::processVariables($invoice->terms);
+ $invoice->invoice_footer = Utils::processVariables($invoice->invoice_footer);
+ $invoice->public_notes = Utils::processVariables($invoice->public_notes);
+ }
if (isset($data['po_number'])) {
$invoice->po_number = trim($data['po_number']);
@@ -292,12 +316,10 @@ class InvoiceRepository extends BaseRepository
$invoice->invoice_design_id = isset($data['invoice_design_id']) ? $data['invoice_design_id'] : $account->invoice_design_id;
- if (isset($data['tax_name']) && isset($data['tax_rate']) && $data['tax_name']) {
- $invoice->tax_rate = Utils::parseFloat($data['tax_rate']);
- $invoice->tax_name = trim($data['tax_name']);
- } else {
- $invoice->tax_rate = 0;
- $invoice->tax_name = '';
+ // provide backwards compatability
+ if (isset($data['tax_name']) && isset($data['tax_rate'])) {
+ $data['tax_name1'] = $data['tax_name'];
+ $data['tax_rate1'] = $data['tax_rate'];
}
$total = 0;
@@ -318,20 +340,24 @@ class InvoiceRepository extends BaseRepository
foreach ($data['invoice_items'] as $item) {
$item = (array) $item;
- if (isset($item['tax_rate']) && Utils::parseFloat($item['tax_rate']) > 0) {
- $invoiceItemCost = round(Utils::parseFloat($item['cost']), 2);
- $invoiceItemQty = round(Utils::parseFloat($item['qty']), 2);
- $invoiceItemTaxRate = Utils::parseFloat($item['tax_rate']);
- $lineTotal = $invoiceItemCost * $invoiceItemQty;
+ $invoiceItemCost = round(Utils::parseFloat($item['cost']), 2);
+ $invoiceItemQty = round(Utils::parseFloat($item['qty']), 2);
+ $lineTotal = $invoiceItemCost * $invoiceItemQty;
- if ($invoice->discount > 0) {
- if ($invoice->is_amount_discount) {
- $lineTotal -= round(($lineTotal/$total) * $invoice->discount, 2);
- } else {
- $lineTotal -= round($lineTotal * ($invoice->discount/100), 2);
- }
+ if ($invoice->discount > 0) {
+ if ($invoice->is_amount_discount) {
+ $lineTotal -= round(($lineTotal/$total) * $invoice->discount, 2);
+ } else {
+ $lineTotal -= round($lineTotal * ($invoice->discount/100), 2);
}
+ }
+ if (isset($item['tax_rate1']) && Utils::parseFloat($item['tax_rate1']) > 0) {
+ $invoiceItemTaxRate = Utils::parseFloat($item['tax_rate1']);
+ $itemTax += round($lineTotal * $invoiceItemTaxRate / 100, 2);
+ }
+ if (isset($item['tax_rate2']) && Utils::parseFloat($item['tax_rate2']) > 0) {
+ $invoiceItemTaxRate = Utils::parseFloat($item['tax_rate2']);
$itemTax += round($lineTotal * $invoiceItemTaxRate / 100, 2);
}
}
@@ -373,8 +399,9 @@ class InvoiceRepository extends BaseRepository
$total += $invoice->custom_value2;
}
- $total += $total * $invoice->tax_rate / 100;
- $total = round($total, 2);
+ $taxAmount1 = round($total * $invoice->tax_rate1 / 100, 2);
+ $taxAmount2 = round($total * $invoice->tax_rate2 / 100, 2);
+ $total = round($total + $taxAmount1 + $taxAmount2, 2);
$total += $itemTax;
// custom fields not charged taxes
@@ -397,6 +424,53 @@ class InvoiceRepository extends BaseRepository
if ($publicId) {
$invoice->invoice_items()->forceDelete();
}
+
+ $document_ids = !empty($data['document_ids'])?array_map('intval', $data['document_ids']):array();;
+ foreach ($document_ids as $document_id){
+ $document = Document::scope($document_id)->first();
+ if($document && Auth::user()->can('edit', $document)){
+
+ if($document->invoice_id && $document->invoice_id != $invoice->id){
+ // From a clone
+ $document = $document->cloneDocument();
+ $document_ids[] = $document->public_id;// Don't remove this document
+ }
+
+ $document->invoice_id = $invoice->id;
+ $document->expense_id = null;
+ $document->save();
+ }
+ }
+
+ if(!empty($data['documents']) && Auth::user()->can('create', ENTITY_DOCUMENT)){
+ // Fallback upload
+ $doc_errors = array();
+ foreach($data['documents'] as $upload){
+ $result = $this->documentRepo->upload($upload);
+ if(is_string($result)){
+ $doc_errors[] = $result;
+ }
+ else{
+ $result->invoice_id = $invoice->id;
+ $result->save();
+ $document_ids[] = $result->public_id;
+ }
+ }
+ if(!empty($doc_errors)){
+ Session::flash('error', implode('
',array_map('htmlentities',$doc_errors)));
+ }
+ }
+
+ foreach ($invoice->documents as $document){
+ if(!in_array($document->public_id, $document_ids)){
+ // Removed
+ // Not checking permissions; deleting a document is just editing the invoice
+ if($document->invoice_id == $invoice->id){
+ // Make sure the document isn't on a clone
+ $document->delete();
+ }
+ }
+ }
foreach ($data['invoice_items'] as $item) {
$item = (array) $item;
@@ -407,7 +481,7 @@ class InvoiceRepository extends BaseRepository
$task = false;
if (isset($item['task_public_id']) && $item['task_public_id']) {
$task = Task::scope($item['task_public_id'])->where('invoice_id', '=', null)->firstOrFail();
- if(!$checkSubPermissions || $task->canEdit()){
+ if(Auth::user()->can('edit', $task)){
$task->invoice_id = $invoice->id;
$task->client_id = $invoice->client_id;
$task->save();
@@ -417,7 +491,7 @@ class InvoiceRepository extends BaseRepository
$expense = false;
if (isset($item['expense_public_id']) && $item['expense_public_id']) {
$expense = Expense::scope($item['expense_public_id'])->where('invoice_id', '=', null)->firstOrFail();
- if(!$checkSubPermissions || $expense->canEdit()){
+ if(Auth::user()->can('edit', $expense)){
$expense->invoice_id = $invoice->id;
$expense->client_id = $invoice->client_id;
$expense->save();
@@ -428,7 +502,7 @@ class InvoiceRepository extends BaseRepository
if (\Auth::user()->account->update_products && ! strtotime($productKey)) {
$product = Product::findProductByKey($productKey);
if (!$product) {
- if(!$checkSubPermissions || Product::canCreate()){
+ if (Auth::user()->can('create', ENTITY_PRODUCT)) {
$product = Product::createNew();
$product->product_key = trim($item['product_key']);
}
@@ -436,7 +510,7 @@ class InvoiceRepository extends BaseRepository
$product = null;
}
}
- if($product && (!$checkSubPermissions || $product->canEdit())){
+ if ($product && (Auth::user()->can('edit', $product))) {
$product->notes = ($task || $expense) ? '' : $item['notes'];
$product->cost = $expense ? 0 : $item['cost'];
$product->save();
@@ -450,7 +524,6 @@ class InvoiceRepository extends BaseRepository
$invoiceItem->notes = trim($invoice->is_recurring ? $item['notes'] : Utils::processVariables($item['notes']));
$invoiceItem->cost = Utils::parseFloat($item['cost']);
$invoiceItem->qty = Utils::parseFloat($item['qty']);
- $invoiceItem->tax_rate = 0;
if (isset($item['custom_value1'])) {
$invoiceItem->custom_value1 = $item['custom_value1'];
@@ -459,11 +532,14 @@ class InvoiceRepository extends BaseRepository
$invoiceItem->custom_value2 = $item['custom_value2'];
}
- if (isset($item['tax_rate']) && isset($item['tax_name']) && $item['tax_name']) {
- $invoiceItem['tax_rate'] = Utils::parseFloat($item['tax_rate']);
- $invoiceItem['tax_name'] = trim($item['tax_name']);
+ // provide backwards compatability
+ if (isset($item['tax_name']) && isset($item['tax_rate'])) {
+ $item['tax_name1'] = $item['tax_name'];
+ $item['tax_rate1'] = $item['tax_rate'];
}
+ $invoiceItem->fill($item);
+
$invoice->invoice_items()->save($invoiceItem);
}
@@ -494,14 +570,13 @@ class InvoiceRepository extends BaseRepository
}
}
$clone->invoice_number = $invoiceNumber ?: $account->getNextInvoiceNumber($clone);
+ $clone->invoice_date = date_create()->format('Y-m-d');
foreach ([
'client_id',
'discount',
'is_amount_discount',
- 'invoice_date',
'po_number',
- 'due_date',
'is_recurring',
'frequency_id',
'start_date',
@@ -510,8 +585,10 @@ class InvoiceRepository extends BaseRepository
'invoice_footer',
'public_notes',
'invoice_design_id',
- 'tax_name',
- 'tax_rate',
+ 'tax_name1',
+ 'tax_rate1',
+ 'tax_name2',
+ 'tax_rate2',
'amount',
'is_quote',
'custom_value1',
@@ -545,14 +622,22 @@ class InvoiceRepository extends BaseRepository
'notes',
'cost',
'qty',
- 'tax_name',
- 'tax_rate', ] as $field) {
+ 'tax_name1',
+ 'tax_rate1',
+ 'tax_name2',
+ 'tax_rate2',
+ ] as $field) {
$cloneItem->$field = $item->$field;
}
$clone->invoice_items()->save($cloneItem);
}
+ foreach ($invoice->documents as $document) {
+ $cloneDocument = $document->cloneDocument();
+ $invoice->documents()->save($cloneDocument);
+ }
+
foreach ($invoice->invitations as $invitation) {
$cloneInvitation = Invitation::createNew($invoice);
$cloneInvitation->contact_id = $invitation->contact_id;
@@ -581,7 +666,7 @@ class InvoiceRepository extends BaseRepository
return false;
}
- $invoice->load('user', 'invoice_items', 'invoice_design', 'account.country', 'client.contacts', 'client.country');
+ $invoice->load('user', 'invoice_items', 'documents', 'invoice_design', 'account.country', 'client.contacts', 'client.country');
$client = $invoice->client;
if (!$client || $client->is_deleted) {
@@ -632,15 +717,17 @@ class InvoiceRepository extends BaseRepository
$invoice->public_notes = Utils::processVariables($recurInvoice->public_notes);
$invoice->terms = Utils::processVariables($recurInvoice->terms);
$invoice->invoice_footer = Utils::processVariables($recurInvoice->invoice_footer);
- $invoice->tax_name = $recurInvoice->tax_name;
- $invoice->tax_rate = $recurInvoice->tax_rate;
+ $invoice->tax_name1 = $recurInvoice->tax_name1;
+ $invoice->tax_rate1 = $recurInvoice->tax_rate1;
+ $invoice->tax_name2 = $recurInvoice->tax_name2;
+ $invoice->tax_rate2 = $recurInvoice->tax_rate2;
$invoice->invoice_design_id = $recurInvoice->invoice_design_id;
$invoice->custom_value1 = $recurInvoice->custom_value1 ?: 0;
$invoice->custom_value2 = $recurInvoice->custom_value2 ?: 0;
$invoice->custom_taxes1 = $recurInvoice->custom_taxes1 ?: 0;
$invoice->custom_taxes2 = $recurInvoice->custom_taxes2 ?: 0;
- $invoice->custom_text_value1 = $recurInvoice->custom_text_value1;
- $invoice->custom_text_value2 = $recurInvoice->custom_text_value2;
+ $invoice->custom_text_value1 = Utils::processVariables($recurInvoice->custom_text_value1);
+ $invoice->custom_text_value2 = Utils::processVariables($recurInvoice->custom_text_value2);
$invoice->is_amount_discount = $recurInvoice->is_amount_discount;
$invoice->due_date = $recurInvoice->getDueDate();
$invoice->save();
@@ -652,11 +739,20 @@ class InvoiceRepository extends BaseRepository
$item->cost = $recurItem->cost;
$item->notes = Utils::processVariables($recurItem->notes);
$item->product_key = Utils::processVariables($recurItem->product_key);
- $item->tax_name = $recurItem->tax_name;
- $item->tax_rate = $recurItem->tax_rate;
+ $item->tax_name1 = $recurItem->tax_name1;
+ $item->tax_rate1 = $recurItem->tax_rate1;
+ $item->tax_name2 = $recurItem->tax_name2;
+ $item->tax_rate2 = $recurItem->tax_rate2;
+ $item->custom_value1 = Utils::processVariables($recurItem->custom_value1);
+ $item->custom_value2 = Utils::processVariables($recurItem->custom_value2);
$invoice->invoice_items()->save($item);
}
+ foreach ($recurInvoice->documents as $recurDocument) {
+ $document = $recurDocument->cloneDocument();
+ $invoice->documents()->save($document);
+ }
+
foreach ($recurInvoice->invitations as $recurInvitation) {
$invitation = Invitation::createNew($recurInvitation);
$invitation->contact_id = $recurInvitation->contact_id;
diff --git a/app/Ninja/Repositories/NinjaRepository.php b/app/Ninja/Repositories/NinjaRepository.php
index 3f9c1fa4f19e..d1dc7abede6e 100644
--- a/app/Ninja/Repositories/NinjaRepository.php
+++ b/app/Ninja/Repositories/NinjaRepository.php
@@ -4,7 +4,7 @@ use App\Models\Account;
class NinjaRepository
{
- public function updateProPlanPaid($clientPublicId, $proPlanPaid)
+ public function updatePlanDetails($clientPublicId, $data)
{
$account = Account::whereId($clientPublicId)->first();
@@ -12,7 +12,13 @@ class NinjaRepository
return;
}
- $account->pro_plan_paid = $proPlanPaid;
- $account->save();
+ $company = $account->company;
+ $company->plan = !empty($data['plan']) && $data['plan'] != PLAN_FREE?$data['plan']:null;
+ $company->plan_term = !empty($data['plan_term'])?$data['plan_term']:null;
+ $company->plan_paid = !empty($data['plan_paid'])?$data['plan_paid']:null;
+ $company->plan_started = !empty($data['plan_started'])?$data['plan_started']:null;
+ $company->plan_expires = !empty($data['plan_expires'])?$data['plan_expires']:null;
+
+ $company->save();
}
}
diff --git a/app/Ninja/Repositories/PaymentRepository.php b/app/Ninja/Repositories/PaymentRepository.php
index a027cb62aedb..dd99fccdfdd4 100644
--- a/app/Ninja/Repositories/PaymentRepository.php
+++ b/app/Ninja/Repositories/PaymentRepository.php
@@ -34,7 +34,7 @@ class PaymentRepository extends BaseRepository
DB::raw('COALESCE(clients.currency_id, accounts.currency_id) currency_id'),
DB::raw('COALESCE(clients.country_id, accounts.country_id) country_id'),
'payments.transaction_reference',
- 'clients.name as client_name',
+ DB::raw("COALESCE(NULLIF(clients.name,''), NULLIF(CONCAT(contacts.first_name, ' ', contacts.last_name),''), NULLIF(contacts.email,'')) client_name"),
'clients.public_id as client_public_id',
'clients.user_id as client_user_id',
'payments.amount',
@@ -64,7 +64,14 @@ class PaymentRepository extends BaseRepository
if ($filter) {
$query->where(function ($query) use ($filter) {
- $query->where('clients.name', 'like', '%'.$filter.'%');
+ $query->where('clients.name', 'like', '%'.$filter.'%')
+ ->orWhere('invoices.invoice_number', 'like', '%'.$filter.'%')
+ ->orWhere('payments.transaction_reference', 'like', '%'.$filter.'%')
+ ->orWhere('gateways.name', 'like', '%'.$filter.'%')
+ ->orWhere('payment_types.name', 'like', '%'.$filter.'%')
+ ->orWhere('contacts.first_name', 'like', '%'.$filter.'%')
+ ->orWhere('contacts.last_name', 'like', '%'.$filter.'%')
+ ->orWhere('contacts.email', 'like', '%'.$filter.'%');
});
}
@@ -94,7 +101,7 @@ class PaymentRepository extends BaseRepository
'invitations.invitation_key',
'payments.public_id',
'payments.transaction_reference',
- 'clients.name as client_name',
+ DB::raw("COALESCE(NULLIF(clients.name,''), NULLIF(CONCAT(contacts.first_name, ' ', contacts.last_name),''), NULLIF(contacts.email,'')) client_name"),
'clients.public_id as client_public_id',
'payments.amount',
'payments.payment_date',
@@ -116,12 +123,15 @@ class PaymentRepository extends BaseRepository
return $query;
}
- public function save($input)
+ public function save($input, $payment = null)
{
$publicId = isset($input['public_id']) ? $input['public_id'] : false;
- if ($publicId) {
+ if ($payment) {
+ // do nothing
+ } elseif ($publicId) {
$payment = Payment::scope($publicId)->firstOrFail();
+ \Log::warning('Entity not set in payment repo save');
} else {
$payment = Payment::createNew();
}
diff --git a/app/Ninja/Repositories/ProductRepository.php b/app/Ninja/Repositories/ProductRepository.php
index 417b49f23640..eb0e7383e9e5 100644
--- a/app/Ninja/Repositories/ProductRepository.php
+++ b/app/Ninja/Repositories/ProductRepository.php
@@ -1,6 +1,7 @@
firstOrFail();
+ \Log::warning('Entity not set in product repo save');
+ } else {
+ $product = Product::createNew();
+ }
+
+ $product->fill($data);
+ $product->save();
+
+ return $product;
+ }
+
}
\ No newline at end of file
diff --git a/app/Ninja/Repositories/ReferralRepository.php b/app/Ninja/Repositories/ReferralRepository.php
index c847f3386b39..f96475c72ddc 100644
--- a/app/Ninja/Repositories/ReferralRepository.php
+++ b/app/Ninja/Repositories/ReferralRepository.php
@@ -1,31 +1,32 @@
where('referral_user_id', $userId)
- ->get(['id', 'pro_plan_paid']);
+ $accounts = Account::where('referral_user_id', $userId);
$counts = [
'free' => 0,
- 'pro' => 0
+ 'pro' => 0,
+ 'enterprise' => 0
];
foreach ($accounts as $account) {
$counts['free']++;
- if (Utils::withinPastYear($account->pro_plan_paid)) {
+ $plan = $account->getPlanDetails(false, false);
+
+ if ($plan) {
$counts['pro']++;
+ if ($plan['plan'] == PLAN_ENTERPRISE) {
+ $counts['enterprise']++;
+ }
}
}
return $counts;
}
-
-
-
}
\ No newline at end of file
diff --git a/app/Ninja/Repositories/TaskRepository.php b/app/Ninja/Repositories/TaskRepository.php
index a7655a8abd9e..3a5eca04a112 100644
--- a/app/Ninja/Repositories/TaskRepository.php
+++ b/app/Ninja/Repositories/TaskRepository.php
@@ -25,7 +25,7 @@ class TaskRepository
->where('clients.deleted_at', '=', null)
->select(
'tasks.public_id',
- 'clients.name as client_name',
+ \DB::raw("COALESCE(NULLIF(clients.name,''), NULLIF(CONCAT(contacts.first_name, ' ', contacts.last_name),''), NULLIF(contacts.email,'')) client_name"),
'clients.public_id as client_public_id',
'clients.user_id as client_user_id',
'contacts.first_name',
@@ -64,24 +64,13 @@ class TaskRepository
return $query;
}
- public function getErrors($input)
+ public function save($publicId, $data, $task = null)
{
- $rules = [
- 'time_log' => 'time_log',
- ];
- $validator = \Validator::make($input, $rules);
-
- if ($validator->fails()) {
- return $validator;
- }
-
- return false;
- }
-
- public function save($publicId, $data)
- {
- if ($publicId) {
+ if ($task) {
+ // do nothing
+ } elseif ($publicId) {
$task = Task::scope($publicId)->firstOrFail();
+ \Log::warning('Entity not set in task repo save');
} else {
$task = Task::createNew();
}
diff --git a/app/Ninja/Repositories/TaxRateRepository.php b/app/Ninja/Repositories/TaxRateRepository.php
index 2e325100a016..8f1ad7f6550f 100644
--- a/app/Ninja/Repositories/TaxRateRepository.php
+++ b/app/Ninja/Repositories/TaxRateRepository.php
@@ -20,14 +20,15 @@ class TaxRateRepository extends BaseRepository
->select('tax_rates.public_id', 'tax_rates.name', 'tax_rates.rate', 'tax_rates.deleted_at');
}
- public function save($data, $taxRate = false)
+ public function save($data, $taxRate = null)
{
- if ( ! $taxRate) {
- if (isset($data['public_id'])) {
- $taxRate = TaxRate::scope($data['public_id'])->firstOrFail();
- } else {
- $taxRate = TaxRate::createNew();
- }
+ if ($taxRate) {
+ // do nothing
+ } elseif (isset($data['public_id'])) {
+ $taxRate = TaxRate::scope($data['public_id'])->firstOrFail();
+ \Log::warning('Entity not set in tax rate repo save');
+ } else {
+ $taxRate = TaxRate::createNew();
}
$taxRate->fill($data);
diff --git a/app/Ninja/Repositories/TokenRepository.php b/app/Ninja/Repositories/TokenRepository.php
index 5237eb7a0369..af0bbb6533d0 100644
--- a/app/Ninja/Repositories/TokenRepository.php
+++ b/app/Ninja/Repositories/TokenRepository.php
@@ -13,10 +13,10 @@ class TokenRepository extends BaseRepository
return 'App\Models\AccountToken';
}
- public function find($accountId)
+ public function find($userId)
{
$query = DB::table('account_tokens')
- ->where('account_tokens.account_id', '=', $accountId);
+ ->where('account_tokens.user_id', '=', $userId);
if (!Session::get('show_trash:token')) {
$query->where('account_tokens.deleted_at', '=', null);
diff --git a/app/Ninja/Repositories/VendorRepository.php b/app/Ninja/Repositories/VendorRepository.php
index df885f62e12e..82e1bfdd18f1 100644
--- a/app/Ninja/Repositories/VendorRepository.php
+++ b/app/Ninja/Repositories/VendorRepository.php
@@ -16,7 +16,7 @@ class VendorRepository extends BaseRepository
public function all()
{
return Vendor::scope()
- ->with('user', 'vendorcontacts', 'country')
+ ->with('user', 'vendor_contacts', 'country')
->withTrashed()
->where('is_deleted', '=', false)
->get();
@@ -62,21 +62,24 @@ class VendorRepository extends BaseRepository
return $query;
}
- public function save($data)
+ public function save($data, $vendor = null)
{
$publicId = isset($data['public_id']) ? $data['public_id'] : false;
- if (!$publicId || $publicId == '-1') {
+ if ($vendor) {
+ // do nothing
+ } elseif (!$publicId || $publicId == '-1') {
$vendor = Vendor::createNew();
} else {
- $vendor = Vendor::scope($publicId)->with('vendorcontacts')->firstOrFail();
+ $vendor = Vendor::scope($publicId)->with('vendor_contacts')->firstOrFail();
+ \Log::warning('Entity not set in vendor repo save');
}
$vendor->fill($data);
$vendor->save();
$first = true;
- $vendorcontacts = isset($data['vendorcontact']) ? [$data['vendorcontact']] : $data['vendorcontacts'];
+ $vendorcontacts = isset($data['vendor_contact']) ? [$data['vendor_contact']] : $data['vendor_contacts'];
foreach ($vendorcontacts as $vendorcontact) {
$vendorcontact = $vendor->addVendorContact($vendorcontact, $first);
diff --git a/app/Ninja/Transformers/AccountTransformer.php b/app/Ninja/Transformers/AccountTransformer.php
index 6a1c32f30e09..f56635bad2b1 100644
--- a/app/Ninja/Transformers/AccountTransformer.php
+++ b/app/Ninja/Transformers/AccountTransformer.php
@@ -14,12 +14,12 @@ class AccountTransformer extends EntityTransformer
'users',
'products',
'taxRates',
- 'payments'
];
protected $availableIncludes = [
'clients',
'invoices',
+ 'payments',
];
public function includeUsers(Account $account)
diff --git a/app/Ninja/Transformers/ClientTransformer.php b/app/Ninja/Transformers/ClientTransformer.php
index f7d786a2ee25..ea282f74ceca 100644
--- a/app/Ninja/Transformers/ClientTransformer.php
+++ b/app/Ninja/Transformers/ClientTransformer.php
@@ -47,7 +47,7 @@ class ClientTransformer extends EntityTransformer
protected $availableIncludes = [
'invoices',
'credits',
- 'expenses',
+ //'expenses',
];
public function includeContacts(Client $client)
@@ -58,7 +58,7 @@ class ClientTransformer extends EntityTransformer
public function includeInvoices(Client $client)
{
- $transformer = new InvoiceTransformer($this->account, $this->serializer);
+ $transformer = new InvoiceTransformer($this->account, $this->serializer, $client);
return $this->includeCollection($client->invoices, $transformer, ENTITY_INVOICE);
}
@@ -77,13 +77,11 @@ class ClientTransformer extends EntityTransformer
public function transform(Client $client)
{
- return [
+ return array_merge($this->getDefaults($client), [
'id' => (int) $client->public_id,
'name' => $client->name,
'balance' => (float) $client->balance,
'paid_to_date' => (float) $client->paid_to_date,
- 'user_id' => (int) $client->user->public_id + 1,
- 'account_key' => $this->account->account_key,
'updated_at' => $this->getTimestamp($client->updated_at),
'archived_at' => $this->getTimestamp($client->deleted_at),
'address1' => $client->address1,
@@ -106,6 +104,6 @@ class ClientTransformer extends EntityTransformer
'currency_id' => (int) $client->currency_id,
'custom_value1' => $client->custom_value1,
'custom_value2' => $client->custom_value2,
- ];
+ ]);
}
}
\ No newline at end of file
diff --git a/app/Ninja/Transformers/ContactTransformer.php b/app/Ninja/Transformers/ContactTransformer.php
index e404b73660d4..68172e156c60 100644
--- a/app/Ninja/Transformers/ContactTransformer.php
+++ b/app/Ninja/Transformers/ContactTransformer.php
@@ -8,7 +8,7 @@ class ContactTransformer extends EntityTransformer
{
public function transform(Contact $contact)
{
- return [
+ return array_merge($this->getDefaults($contact), [
'id' => (int) $contact->public_id,
'first_name' => $contact->first_name,
'last_name' => $contact->last_name,
@@ -18,8 +18,7 @@ class ContactTransformer extends EntityTransformer
'is_primary' => (bool) $contact->is_primary,
'phone' => $contact->phone,
'last_login' => $contact->last_login,
- 'account_key' => $this->account->account_key,
'send_invoice' => (bool) $contact->send_invoice,
- ];
+ ]);
}
}
\ No newline at end of file
diff --git a/app/Ninja/Transformers/CreditTransformer.php b/app/Ninja/Transformers/CreditTransformer.php
index a33185d2ff39..39ce5ff1d8f3 100644
--- a/app/Ninja/Transformers/CreditTransformer.php
+++ b/app/Ninja/Transformers/CreditTransformer.php
@@ -8,17 +8,16 @@ class CreditTransformer extends EntityTransformer
{
public function transform(Credit $credit)
{
- return [
+ return array_merge($this->getDefaults($credit), [
'id' => (int) $credit->public_id,
'amount' => (float) $credit->amount,
'balance' => (float) $credit->balance,
'updated_at' => $this->getTimestamp($credit->updated_at),
'archived_at' => $this->getTimestamp($credit->deleted_at),
'is_deleted' => (bool) $credit->is_deleted,
- 'account_key' => $this->account->account_key,
'credit_date' => $credit->credit_date,
'credit_number' => $credit->credit_number,
'private_notes' => $credit->private_notes,
- ];
+ ]);
}
}
\ No newline at end of file
diff --git a/app/Ninja/Transformers/DocumentTransformer.php b/app/Ninja/Transformers/DocumentTransformer.php
new file mode 100644
index 000000000000..4cbfa0619193
--- /dev/null
+++ b/app/Ninja/Transformers/DocumentTransformer.php
@@ -0,0 +1,19 @@
+getDefaults($document), [
+ 'id' => (int) $document->public_id,
+ 'name' => $document->name,
+ 'type' => $document->type,
+ 'invoice_id' => isset($document->invoice->public_id) ? (int) $document->invoice->public_id : null,
+ 'expense_id' => isset($document->expense->public_id) ? (int) $document->expense->public_id : null,
+ ]);
+ }
+}
\ No newline at end of file
diff --git a/app/Ninja/Transformers/EntityTransformer.php b/app/Ninja/Transformers/EntityTransformer.php
index ea0dba263d97..d2d02bd0b6ee 100644
--- a/app/Ninja/Transformers/EntityTransformer.php
+++ b/app/Ninja/Transformers/EntityTransformer.php
@@ -1,5 +1,6 @@
getTimestamp() : null;
}
+
+ public function getDefaultIncludes()
+ {
+ return $this->defaultIncludes;
+ }
+
+ protected function getDefaults($entity)
+ {
+ $data = [
+ 'account_key' => $this->account->account_key,
+ 'is_owner' => (bool) Auth::user()->owns($entity),
+ ];
+
+ if ($entity->relationLoaded('user')) {
+ $data['user_id'] = (int) $entity->user->public_id + 1;
+ }
+
+ return $data;
+ }
}
diff --git a/app/Ninja/Transformers/ExpenseTransformer.php b/app/Ninja/Transformers/ExpenseTransformer.php
index a6d358d15766..46c334cb3e55 100644
--- a/app/Ninja/Transformers/ExpenseTransformer.php
+++ b/app/Ninja/Transformers/ExpenseTransformer.php
@@ -6,10 +6,16 @@ use League\Fractal;
class ExpenseTransformer extends EntityTransformer
{
+ public function __construct($account = null, $serializer = null, $client = null)
+ {
+ parent::__construct($account, $serializer);
+
+ $this->client = $client;
+ }
+
public function transform(Expense $expense)
{
-
- return [
+ return array_merge($this->getDefaults($expense), [
'id' => (int) $expense->public_id,
'private_notes' => $expense->private_notes,
'public_notes' => $expense->public_notes,
@@ -19,15 +25,14 @@ class ExpenseTransformer extends EntityTransformer
'transaction_id' => $expense->transaction_id,
'bank_id' => $expense->bank_id,
'expense_currency_id' => (int) $expense->expense_currency_id,
- 'account_key' => $this->account->account_key,
'amount' => (float) $expense->amount,
'expense_date' => $expense->expense_date,
'exchange_rate' => (float) $expense->exchange_rate,
'invoice_currency_id' => (int) $expense->invoice_currency_id,
'is_deleted' => (bool) $expense->is_deleted,
- 'client_id' => isset($expense->client->public_id) ? (int) $expense->client->public_id : null,
+ 'client_id' => $this->client ? $this->client->public_id : (isset($expense->client->public_id) ? (int) $expense->client->public_id : null),
'invoice_id' => isset($expense->invoice->public_id) ? (int) $expense->invoice->public_id : null,
'vendor_id' => isset($expense->vendor->public_id) ? (int) $expense->vendor->public_id : null,
- ];
+ ]);
}
}
\ No newline at end of file
diff --git a/app/Ninja/Transformers/InvoiceItemTransformer.php b/app/Ninja/Transformers/InvoiceItemTransformer.php
index 66d9fe137dd8..080234f35e1b 100644
--- a/app/Ninja/Transformers/InvoiceItemTransformer.php
+++ b/app/Ninja/Transformers/InvoiceItemTransformer.php
@@ -8,19 +8,19 @@ class InvoiceItemTransformer extends EntityTransformer
{
public function transform(InvoiceItem $item)
{
- return [
+ return array_merge($this->getDefaults($item), [
'id' => (int) $item->public_id,
'product_key' => $item->product_key,
- 'account_key' => $this->account->account_key,
- 'user_id' => (int) $item->user_id,
'updated_at' => $this->getTimestamp($item->updated_at),
'archived_at' => $this->getTimestamp($item->deleted_at),
'product_key' => $item->product_key,
'notes' => $item->notes,
'cost' => (float) $item->cost,
'qty' => (float) $item->qty,
- 'tax_name' => $item->tax_name,
- 'tax_rate' => (float) $item->tax_rate
- ];
+ 'tax_name1' => $item->tax_name1 ? $item->tax_name1 : '',
+ 'tax_rate1' => (float) $item->tax_rate1,
+ 'tax_name2' => $item->tax_name2 ? $item->tax_name1 : '',
+ 'tax_rate2' => (float) $item->tax_rate2,
+ ]);
}
}
\ No newline at end of file
diff --git a/app/Ninja/Transformers/InvoiceTransformer.php b/app/Ninja/Transformers/InvoiceTransformer.php
index b67635386d8e..c866f1213540 100644
--- a/app/Ninja/Transformers/InvoiceTransformer.php
+++ b/app/Ninja/Transformers/InvoiceTransformer.php
@@ -28,9 +28,16 @@ class InvoiceTransformer extends EntityTransformer
'invitations',
'payments',
'client',
- 'expenses',
+ //'expenses',
];
+ public function __construct($account = null, $serializer = null, $client = null)
+ {
+ parent::__construct($account, $serializer);
+
+ $this->client = $client;
+ }
+
public function includeInvoiceItems(Invoice $invoice)
{
$transformer = new InvoiceItemTransformer($this->account, $this->serializer);
@@ -45,7 +52,7 @@ class InvoiceTransformer extends EntityTransformer
public function includePayments(Invoice $invoice)
{
- $transformer = new PaymentTransformer($this->account, $this->serializer);
+ $transformer = new PaymentTransformer($this->account, $this->serializer, $invoice);
return $this->includeCollection($invoice->payments, $transformer, ENTITY_PAYMENT);
}
@@ -64,11 +71,11 @@ class InvoiceTransformer extends EntityTransformer
public function transform(Invoice $invoice)
{
- return [
+ return array_merge($this->getDefaults($invoice), [
'id' => (int) $invoice->public_id,
'amount' => (float) $invoice->amount,
'balance' => (float) $invoice->balance,
- 'client_id' => (int) $invoice->client->public_id,
+ 'client_id' => (int) ($this->client ? $this->client->public_id : $invoice->client->public_id),
'invoice_status_id' => (int) $invoice->invoice_status_id,
'updated_at' => $this->getTimestamp($invoice->updated_at),
'archived_at' => $this->getTimestamp($invoice->deleted_at),
@@ -87,8 +94,10 @@ class InvoiceTransformer extends EntityTransformer
'end_date' => $invoice->end_date,
'last_sent_date' => $invoice->last_sent_date,
'recurring_invoice_id' => (int) $invoice->recurring_invoice_id,
- 'tax_name' => $invoice->tax_name,
- 'tax_rate' => (float) $invoice->tax_rate,
+ 'tax_name1' => $invoice->tax_name1 ? $invoice->tax_name1 : '',
+ 'tax_rate1' => (float) $invoice->tax_rate1,
+ 'tax_name2' => $invoice->tax_name2 ? $invoice->tax_name2 : '',
+ 'tax_rate2' => (float) $invoice->tax_rate2,
'amount' => (float) $invoice->amount,
'balance' => (float) $invoice->balance,
'is_amount_discount' => (bool) $invoice->is_amount_discount,
@@ -96,8 +105,6 @@ class InvoiceTransformer extends EntityTransformer
'partial' => (float) $invoice->partial,
'has_tasks' => (bool) $invoice->has_tasks,
'auto_bill' => (bool) $invoice->auto_bill,
- 'account_key' => $this->account->account_key,
- 'user_id' => (int) $invoice->user->public_id + 1,
'custom_value1' => (float) $invoice->custom_value1,
'custom_value2' => (float) $invoice->custom_value2,
'custom_taxes1' => (bool) $invoice->custom_taxes1,
@@ -106,6 +113,6 @@ class InvoiceTransformer extends EntityTransformer
'quote_invoice_id' => (int) $invoice->quote_invoice_id,
'custom_text_value1' => $invoice->custom_text_value1,
'custom_text_value2' => $invoice->custom_text_value2,
- ];
+ ]);
}
}
diff --git a/app/Ninja/Transformers/PaymentTransformer.php b/app/Ninja/Transformers/PaymentTransformer.php
index a1de09cd6ff4..c4e4328cb845 100644
--- a/app/Ninja/Transformers/PaymentTransformer.php
+++ b/app/Ninja/Transformers/PaymentTransformer.php
@@ -26,10 +26,11 @@ class PaymentTransformer extends EntityTransformer
];
- public function __construct(Account $account)
+ public function __construct($account = null, $serializer = null, $invoice = null)
{
- parent::__construct($account);
-
+ parent::__construct($account, $serializer);
+
+ $this->invoice = $invoice;
}
public function includeInvoice(Payment $payment)
@@ -46,18 +47,16 @@ class PaymentTransformer extends EntityTransformer
public function transform(Payment $payment)
{
- return [
+ return array_merge($this->getDefaults($payment), [
'id' => (int) $payment->public_id,
'amount' => (float) $payment->amount,
- 'account_key' => $this->account->account_key,
- 'user_id' => (int) $payment->user->public_id + 1,
'transaction_reference' => $payment->transaction_reference,
'payment_date' => $payment->payment_date,
'updated_at' => $this->getTimestamp($payment->updated_at),
'archived_at' => $this->getTimestamp($payment->deleted_at),
'is_deleted' => (bool) $payment->is_deleted,
'payment_type_id' => (int) $payment->payment_type_id,
- 'invoice_id' => (int) $payment->invoice->public_id,
- ];
+ 'invoice_id' => (int) ($this->invoice ? $this->invoice->public_id : $payment->invoice->public_id),
+ ]);
}
}
\ No newline at end of file
diff --git a/app/Ninja/Transformers/ProductTransformer.php b/app/Ninja/Transformers/ProductTransformer.php
index 34fbcf7f18ff..309305815fb0 100644
--- a/app/Ninja/Transformers/ProductTransformer.php
+++ b/app/Ninja/Transformers/ProductTransformer.php
@@ -7,16 +7,15 @@ class ProductTransformer extends EntityTransformer
{
public function transform(Product $product)
{
- return [
+ return array_merge($this->getDefaults($product), [
'id' => (int) $product->public_id,
'product_key' => $product->product_key,
'notes' => $product->notes,
'cost' => $product->cost,
'qty' => $product->qty,
- 'account_key' =>$this->account->account_key,
'default_tax_rate_id' =>$product->default_tax_rate_id,
'updated_at' =>$this->getTimestamp($product->updated_at),
'archived_at' => $this->getTimestamp($product->deleted_at),
- ];
+ ]);
}
}
\ No newline at end of file
diff --git a/app/Ninja/Transformers/TaskTransformer.php b/app/Ninja/Transformers/TaskTransformer.php
index 908a8118aaea..7bfc474a72f2 100644
--- a/app/Ninja/Transformers/TaskTransformer.php
+++ b/app/Ninja/Transformers/TaskTransformer.php
@@ -39,12 +39,10 @@ class TaskTransformer extends EntityTransformer
public function transform(Task $task)
{
- return [
+ return array_merge($this->getDefaults($task), [
'id' => (int) $task->public_id,
- 'account_key' => $this->account->account_key,
- 'user_id' => (int) $task->user->public_id + 1,
'description' => $task->description,
'duration' => $task->getDuration()
- ];
+ ]);
}
}
\ No newline at end of file
diff --git a/app/Ninja/Transformers/TaxRateTransformer.php b/app/Ninja/Transformers/TaxRateTransformer.php
index f7d307bf7bb4..a0c5aab539a0 100644
--- a/app/Ninja/Transformers/TaxRateTransformer.php
+++ b/app/Ninja/Transformers/TaxRateTransformer.php
@@ -21,13 +21,12 @@ class TaxRateTransformer extends EntityTransformer
public function transform(TaxRate $taxRate)
{
- return [
+ return array_merge($this->getDefaults($taxRate), [
'id' => (int) $taxRate->public_id,
'name' => $taxRate->name,
'rate' => (float) $taxRate->rate,
'updated_at' => $this->getTimestamp($taxRate->updated_at),
'archived_at' => $this->getTimestamp($taxRate->deleted_at),
- 'account_key' => $this->account->account_key,
- ];
+ ]);
}
}
\ No newline at end of file
diff --git a/app/Ninja/Transformers/UserAccountTransformer.php b/app/Ninja/Transformers/UserAccountTransformer.php
index bc49a96c546a..e914a25c663d 100644
--- a/app/Ninja/Transformers/UserAccountTransformer.php
+++ b/app/Ninja/Transformers/UserAccountTransformer.php
@@ -32,7 +32,7 @@ class UserAccountTransformer extends EntityTransformer
return [
'account_key' => $user->account->account_key,
'name' => $user->account->present()->name,
- 'token' => $user->account->getToken($this->tokenName),
+ 'token' => $user->account->getToken($user->id, $this->tokenName),
'default_url' => SITE_URL
];
}
diff --git a/app/Ninja/Transformers/VendorContactTransformer.php b/app/Ninja/Transformers/VendorContactTransformer.php
index 3b75aee53a28..f277964cec28 100644
--- a/app/Ninja/Transformers/VendorContactTransformer.php
+++ b/app/Ninja/Transformers/VendorContactTransformer.php
@@ -8,7 +8,7 @@ class VendorContactTransformer extends EntityTransformer
{
public function transform(VendorContact $contact)
{
- return [
+ return array_merge($this->getDefaults($contact), [
'id' => (int) $contact->public_id,
'first_name' => $contact->first_name,
'last_name' => $contact->last_name,
@@ -17,7 +17,6 @@ class VendorContactTransformer extends EntityTransformer
'archived_at' => $this->getTimestamp($contact->deleted_at),
'is_primary' => (bool) $contact->is_primary,
'phone' => $contact->phone,
- 'account_key' => $this->account->account_key,
- ];
+ ]);
}
}
\ No newline at end of file
diff --git a/app/Ninja/Transformers/VendorTransformer.php b/app/Ninja/Transformers/VendorTransformer.php
index f0b8fd0415f0..df8dc5ea3461 100644
--- a/app/Ninja/Transformers/VendorTransformer.php
+++ b/app/Ninja/Transformers/VendorTransformer.php
@@ -35,16 +35,19 @@ class VendorTransformer extends EntityTransformer
* @SWG\Property(property="id_number", type="string", example="123456")
*/
+ protected $defaultIncludes = [
+ 'vendor_contacts',
+ ];
+
protected $availableIncludes = [
- 'vendorContacts',
'invoices',
- 'expenses',
+ //'expenses',
];
public function includeVendorContacts(Vendor $vendor)
{
$transformer = new VendorContactTransformer($this->account, $this->serializer);
- return $this->includeCollection($vendor->vendorContacts, $transformer, ENTITY_CONTACT);
+ return $this->includeCollection($vendor->vendor_contacts, $transformer, ENTITY_CONTACT);
}
public function includeInvoices(Vendor $vendor)
@@ -61,13 +64,11 @@ class VendorTransformer extends EntityTransformer
public function transform(Vendor $vendor)
{
- return [
+ return array_merge($this->getDefaults($vendor), [
'id' => (int) $vendor->public_id,
'name' => $vendor->name,
'balance' => (float) $vendor->balance,
'paid_to_date' => (float) $vendor->paid_to_date,
- 'user_id' => (int) $vendor->user->public_id + 1,
- 'account_key' => $this->account->account_key,
'updated_at' => $this->getTimestamp($vendor->updated_at),
'archived_at' => $this->getTimestamp($vendor->deleted_at),
'address1' => $vendor->address1,
@@ -84,6 +85,6 @@ class VendorTransformer extends EntityTransformer
'vat_number' => $vendor->vat_number,
'id_number' => $vendor->id_number,
'currency_id' => (int) $vendor->currency_id
- ];
+ ]);
}
}
\ No newline at end of file
diff --git a/app/Policies/AccountGatewayPolicy.php b/app/Policies/AccountGatewayPolicy.php
new file mode 100644
index 000000000000..1e98caf04e92
--- /dev/null
+++ b/app/Policies/AccountGatewayPolicy.php
@@ -0,0 +1,13 @@
+hasPermission('admin');
+ }
+
+ public static function create($user) {
+ return $user->hasPermission('admin');
+ }
+}
\ No newline at end of file
diff --git a/app/Policies/BankAccountPolicy.php b/app/Policies/BankAccountPolicy.php
new file mode 100644
index 000000000000..fa5eeff84856
--- /dev/null
+++ b/app/Policies/BankAccountPolicy.php
@@ -0,0 +1,13 @@
+hasPermission('admin');
+ }
+
+ public static function create($user) {
+ return $user->hasPermission('admin');
+ }
+}
\ No newline at end of file
diff --git a/app/Policies/ClientPolicy.php b/app/Policies/ClientPolicy.php
new file mode 100644
index 000000000000..4610c139fbfa
--- /dev/null
+++ b/app/Policies/ClientPolicy.php
@@ -0,0 +1,5 @@
+hasPermission('view_all'))return true;
+ if($document->expense){
+ if($document->expense->invoice)return $user->can('view', $document->expense->invoice);
+ return $user->can('view', $document->expense);
+ }
+ if($document->invoice)return $user->can('view', $document->invoice);
+
+ return $user->owns($item);
+ }
+}
\ No newline at end of file
diff --git a/app/Policies/EntityPolicy.php b/app/Policies/EntityPolicy.php
new file mode 100644
index 000000000000..4c5e8ded9d07
--- /dev/null
+++ b/app/Policies/EntityPolicy.php
@@ -0,0 +1,33 @@
+hasPermission('create_all');
+ }
+
+ public static function edit($user, $item) {
+ return $user->hasPermission('edit_all') || $user->owns($item);
+ }
+
+ public static function view($user, $item) {
+ return $user->hasPermission('view_all') || $user->owns($item);
+ }
+
+ public static function viewByOwner($user, $ownerUserId) {
+ return $user->hasPermission('view_all') || $user->id == $ownerUserId;
+ }
+
+ public static function editByOwner($user, $ownerUserId) {
+ return $user->hasPermission('edit_all') || $user->id == $ownerUserId;
+ }
+}
\ No newline at end of file
diff --git a/app/Policies/ExpensePolicy.php b/app/Policies/ExpensePolicy.php
new file mode 100644
index 000000000000..4fdac4d627aa
--- /dev/null
+++ b/app/Policies/ExpensePolicy.php
@@ -0,0 +1,5 @@
+hasPermission('admin');
+ }
+
+ public static function create($user) {
+ return $user->hasPermission('admin');
+ }
+}
\ No newline at end of file
diff --git a/app/Policies/ProductPolicy.php b/app/Policies/ProductPolicy.php
new file mode 100644
index 000000000000..897fe7404a03
--- /dev/null
+++ b/app/Policies/ProductPolicy.php
@@ -0,0 +1,13 @@
+hasPermission('admin');
+ }
+
+ public static function create($user) {
+ return $user->hasPermission('admin');
+ }
+}
\ No newline at end of file
diff --git a/app/Policies/TaskPolicy.php b/app/Policies/TaskPolicy.php
new file mode 100644
index 000000000000..b1fbe2902974
--- /dev/null
+++ b/app/Policies/TaskPolicy.php
@@ -0,0 +1,5 @@
+hasPermission('admin');
+ }
+
+ public static function create($user) {
+ return $user->hasPermission('admin');
+ }
+}
\ No newline at end of file
diff --git a/app/Policies/TokenPolicy.php b/app/Policies/TokenPolicy.php
new file mode 100644
index 000000000000..36e37e313a69
--- /dev/null
+++ b/app/Policies/TokenPolicy.php
@@ -0,0 +1,13 @@
+hasPermission('admin');
+ }
+
+ public static function create($user) {
+ return $user->hasPermission('admin');
+ }
+}
\ No newline at end of file
diff --git a/app/Policies/VendorPolicy.php b/app/Policies/VendorPolicy.php
new file mode 100644
index 000000000000..681cdcb50240
--- /dev/null
+++ b/app/Policies/VendorPolicy.php
@@ -0,0 +1,5 @@
+
'.trans("texts.$types").'';
$items = [];
- if(Auth::user()->hasPermission('create_all')){
- $items[] = '
'.trans('texts.password').': '.$data['password'].'
':false; + $documentsHTML = ''; + + if ($account->hasFeature(FEATURE_DOCUMENTS) && $invoice->hasDocuments()) { + $documentsHTML .= trans('texts.email_documents_header').'
- ';
+ foreach($invoice->documents as $document){
+ $documentsHTML .= '
- '.HTML::entities($document->name).' '; + } + foreach($invoice->expenses as $expense){ + foreach($expense->documents as $document){ + $documentsHTML .= '
- '.HTML::entities($document->name).' '; + } + } + $documentsHTML .= '
\n ![]()
\n
'},d=function(){var a,b,c,d,e,f,g;for(d=arguments[0],c=2<=arguments.length?i.call(arguments,1):[],f=0,g=c.length;g>f;f++){b=c[f];for(a in b)e=b[a],d[a]=e}return d},c.prototype.getAcceptedFiles=function(){var a,b,c,d,e;for(d=this.files,e=[],b=0,c=d.length;c>b;b++)a=d[b],a.accepted&&e.push(a);return e},c.prototype.getRejectedFiles=function(){var a,b,c,d,e;for(d=this.files,e=[],b=0,c=d.length;c>b;b++)a=d[b],a.accepted||e.push(a);return e},c.prototype.getFilesWithStatus=function(a){var b,c,d,e,f;for(e=this.files,f=[],c=0,d=e.length;d>c;c++)b=e[c],b.status===a&&f.push(b);return f},c.prototype.getQueuedFiles=function(){return this.getFilesWithStatus(c.QUEUED)},c.prototype.getUploadingFiles=function(){return this.getFilesWithStatus(c.UPLOADING)},c.prototype.getAddedFiles=function(){return this.getFilesWithStatus(c.ADDED)},c.prototype.getActiveFiles=function(){var a,b,d,e,f;for(e=this.files,f=[],b=0,d=e.length;d>b;b++)a=e[b],(a.status===c.UPLOADING||a.status===c.QUEUED)&&f.push(a);return f},c.prototype.init=function(){var a,b,d,e,f,g,h;for("form"===this.element.tagName&&this.element.setAttribute("enctype","multipart/form-data"),this.element.classList.contains("dropzone")&&!this.element.querySelector(".dz-message")&&this.element.appendChild(c.createElement('")),this.clickableElements.length&&(d=function(a){return function(){return a.hiddenFileInput&&a.hiddenFileInput.parentNode.removeChild(a.hiddenFileInput),a.hiddenFileInput=document.createElement("input"),a.hiddenFileInput.setAttribute("type","file"),(null==a.options.maxFiles||a.options.maxFiles>1)&&a.hiddenFileInput.setAttribute("multiple","multiple"),a.hiddenFileInput.className="dz-hidden-input",null!=a.options.acceptedFiles&&a.hiddenFileInput.setAttribute("accept",a.options.acceptedFiles),null!=a.options.capture&&a.hiddenFileInput.setAttribute("capture",a.options.capture),a.hiddenFileInput.style.visibility="hidden",a.hiddenFileInput.style.position="absolute",a.hiddenFileInput.style.top="0",a.hiddenFileInput.style.left="0",a.hiddenFileInput.style.height="0",a.hiddenFileInput.style.width="0",document.querySelector(a.options.hiddenInputContainer).appendChild(a.hiddenFileInput),a.hiddenFileInput.addEventListener("change",function(){var b,c,e,f;if(c=a.hiddenFileInput.files,c.length)for(e=0,f=c.length;f>e;e++)b=c[e],a.addFile(b);return a.emit("addedfiles",c),d()})}}(this))(),this.URL=null!=(g=window.URL)?g:window.webkitURL,h=this.events,e=0,f=h.length;f>e;e++)a=h[e],this.on(a,this.options[a]);return this.on("uploadprogress",function(a){return function(){return a.updateTotalUploadProgress()}}(this)),this.on("removedfile",function(a){return function(){return a.updateTotalUploadProgress()}}(this)),this.on("canceled",function(a){return function(b){return a.emit("complete",b)}}(this)),this.on("complete",function(a){return function(){return 0===a.getAddedFiles().length&&0===a.getUploadingFiles().length&&0===a.getQueuedFiles().length?setTimeout(function(){return a.emit("queuecomplete")},0):void 0}}(this)),b=function(a){return a.stopPropagation(),a.preventDefault?a.preventDefault():a.returnValue=!1},this.listeners=[{element:this.element,events:{dragstart:function(a){return function(b){return a.emit("dragstart",b)}}(this),dragenter:function(a){return function(c){return b(c),a.emit("dragenter",c)}}(this),dragover:function(a){return function(c){var d;try{d=c.dataTransfer.effectAllowed}catch(e){}return c.dataTransfer.dropEffect="move"===d||"linkMove"===d?"move":"copy",b(c),a.emit("dragover",c)}}(this),dragleave:function(a){return function(b){return a.emit("dragleave",b)}}(this),drop:function(a){return function(c){return b(c),a.drop(c)}}(this),dragend:function(a){return function(b){return a.emit("dragend",b)}}(this)}}],this.clickableElements.forEach(function(a){return function(b){return a.listeners.push({element:b,events:{click:function(d){return(b!==a.element||d.target===a.element||c.elementInside(d.target,a.element.querySelector(".dz-message")))&&a.hiddenFileInput.click(),!0}}})}}(this)),this.enable(),this.options.init.call(this)},c.prototype.destroy=function(){var a;return this.disable(),this.removeAllFiles(!0),(null!=(a=this.hiddenFileInput)?a.parentNode:void 0)&&(this.hiddenFileInput.parentNode.removeChild(this.hiddenFileInput),this.hiddenFileInput=null),delete this.element.dropzone,c.instances.splice(c.instances.indexOf(this),1)},c.prototype.updateTotalUploadProgress=function(){var a,b,c,d,e,f,g,h;if(d=0,c=0,a=this.getActiveFiles(),a.length){for(h=this.getActiveFiles(),f=0,g=h.length;g>f;f++)b=h[f],d+=b.upload.bytesSent,c+=b.upload.total;e=100*d/c}else e=100;return this.emit("totaluploadprogress",e,c,d)},c.prototype._getParamName=function(a){return"function"==typeof this.options.paramName?this.options.paramName(a):""+this.options.paramName+(this.options.uploadMultiple?"["+a+"]":"")},c.prototype._renameFilename=function(a){return"function"!=typeof this.options.renameFilename?a:this.options.renameFilename(a)},c.prototype.getFallbackForm=function(){var a,b,d,e;return(a=this.getExistingFallback())?a:(d='\n
\n \n
\n
\n \n
\n \n
\n \n \n
\n',this.options.dictFallbackText&&(d+="
',b=c.createElement(d),"FORM"!==this.element.tagName?(e=c.createElement(''),e.appendChild(b)):(this.element.setAttribute("enctype","multipart/form-data"),this.element.setAttribute("method",this.options.method)),null!=e?e:b)},c.prototype.getExistingFallback=function(){var a,b,c,d,e,f;for(b=function(a){var b,c,d;for(c=0,d=a.length;d>c;c++)if(b=a[c],/(^| )fallback($| )/.test(b.className))return b},f=["div","form"],d=0,e=f.length;e>d;d++)if(c=f[d],a=b(this.element.getElementsByTagName(c)))return a},c.prototype.setupEventListeners=function(){var a,b,c,d,e,f,g;for(f=this.listeners,g=[],d=0,e=f.length;e>d;d++)a=f[d],g.push(function(){var d,e;d=a.events,e=[];for(b in d)c=d[b],e.push(a.element.addEventListener(b,c,!1));return e}());return g},c.prototype.removeEventListeners=function(){var a,b,c,d,e,f,g;for(f=this.listeners,g=[],d=0,e=f.length;e>d;d++)a=f[d],g.push(function(){var d,e;d=a.events,e=[];for(b in d)c=d[b],e.push(a.element.removeEventListener(b,c,!1));return e}());return g},c.prototype.disable=function(){var a,b,c,d,e;for(this.clickableElements.forEach(function(a){return a.classList.remove("dz-clickable")}),this.removeEventListeners(),d=this.files,e=[],b=0,c=d.length;c>b;b++)a=d[b],e.push(this.cancelUpload(a));return e},c.prototype.enable=function(){return this.clickableElements.forEach(function(a){return a.classList.add("dz-clickable")}),this.setupEventListeners()},c.prototype.filesize=function(a){var b,c,d,e,f,g,h,i;if(d=0,e="b",a>0){for(g=["TB","GB","MB","KB","b"],c=h=0,i=g.length;i>h;c=++h)if(f=g[c],b=Math.pow(this.options.filesizeBase,4-c)/10,a>=b){d=a/Math.pow(this.options.filesizeBase,4-c),e=f;break}d=Math.round(10*d)/10}return""+d+" "+e},c.prototype._updateMaxFilesReachedClass=function(){return null!=this.options.maxFiles&&this.getAcceptedFiles().length>=this.options.maxFiles?(this.getAcceptedFiles().length===this.options.maxFiles&&this.emit("maxfilesreached",this.files),this.element.classList.add("dz-max-files-reached")):this.element.classList.remove("dz-max-files-reached")},c.prototype.drop=function(a){var b,c;a.dataTransfer&&(this.emit("drop",a),b=a.dataTransfer.files,this.emit("addedfiles",b),b.length&&(c=a.dataTransfer.items,c&&c.length&&null!=c[0].webkitGetAsEntry?this._addFilesFromItems(c):this.handleFiles(b)))},c.prototype.paste=function(a){var b,c;if(null!=(null!=a&&null!=(c=a.clipboardData)?c.items:void 0))return this.emit("paste",a),b=a.clipboardData.items,b.length?this._addFilesFromItems(b):void 0},c.prototype.handleFiles=function(a){var b,c,d,e;for(e=[],c=0,d=a.length;d>c;c++)b=a[c],e.push(this.addFile(b));return e},c.prototype._addFilesFromItems=function(a){var b,c,d,e,f;for(f=[],d=0,e=a.length;e>d;d++)c=a[d],f.push(null!=c.webkitGetAsEntry&&(b=c.webkitGetAsEntry())?b.isFile?this.addFile(c.getAsFile()):b.isDirectory?this._addFilesFromDirectory(b,b.name):void 0:null!=c.getAsFile?null==c.kind||"file"===c.kind?this.addFile(c.getAsFile()):void 0:void 0);return f},c.prototype._addFilesFromDirectory=function(a,b){var c,d,e;return c=a.createReader(),d=function(a){return"undefined"!=typeof console&&null!==console&&"function"==typeof console.log?console.log(a):void 0},(e=function(a){return function(){return c.readEntries(function(c){var d,f,g;if(c.length>0){for(f=0,g=c.length;g>f;f++)d=c[f],d.isFile?d.file(function(c){return a.options.ignoreHiddenFiles&&"."===c.name.substring(0,1)?void 0:(c.fullPath=""+b+"/"+c.name,a.addFile(c))}):d.isDirectory&&a._addFilesFromDirectory(d,""+b+"/"+d.name);e()}return null},d)}}(this))()},c.prototype.accept=function(a,b){return a.size>1024*this.options.maxFilesize*1024?b(this.options.dictFileTooBig.replace("{{filesize}}",Math.round(a.size/1024/10.24)/100).replace("{{maxFilesize}}",this.options.maxFilesize)):c.isValidFile(a,this.options.acceptedFiles)?null!=this.options.maxFiles&&this.getAcceptedFiles().length>=this.options.maxFiles?(b(this.options.dictMaxFilesExceeded.replace("{{maxFiles}}",this.options.maxFiles)),this.emit("maxfilesexceeded",a)):this.options.accept.call(this,a,b):b(this.options.dictInvalidFileType)},c.prototype.addFile=function(a){return a.upload={progress:0,total:a.size,bytesSent:0},this.files.push(a),a.status=c.ADDED,this.emit("addedfile",a),this._enqueueThumbnail(a),this.accept(a,function(b){return function(c){return c?(a.accepted=!1,b._errorProcessing([a],c)):(a.accepted=!0,b.options.autoQueue&&b.enqueueFile(a)),b._updateMaxFilesReachedClass()}}(this))},c.prototype.enqueueFiles=function(a){var b,c,d;for(c=0,d=a.length;d>c;c++)b=a[c],this.enqueueFile(b);return null},c.prototype.enqueueFile=function(a){if(a.status!==c.ADDED||a.accepted!==!0)throw new Error("This file can't be queued because it has already been processed or was rejected.");return a.status=c.QUEUED,this.options.autoProcessQueue?setTimeout(function(a){return function(){return a.processQueue()}}(this),0):void 0},c.prototype._thumbnailQueue=[],c.prototype._processingThumbnail=!1,c.prototype._enqueueThumbnail=function(a){return this.options.createImageThumbnails&&a.type.match(/image.*/)&&a.size<=1024*this.options.maxThumbnailFilesize*1024?(this._thumbnailQueue.push(a),setTimeout(function(a){return function(){return a._processThumbnailQueue()}}(this),0)):void 0},c.prototype._processThumbnailQueue=function(){return this._processingThumbnail||0===this._thumbnailQueue.length?void 0:(this._processingThumbnail=!0,this.createThumbnail(this._thumbnailQueue.shift(),function(a){return function(){return a._processingThumbnail=!1,a._processThumbnailQueue()}}(this)))},c.prototype.removeFile=function(a){return a.status===c.UPLOADING&&this.cancelUpload(a),this.files=h(this.files,a),this.emit("removedfile",a),0===this.files.length?this.emit("reset"):void 0},c.prototype.removeAllFiles=function(a){var b,d,e,f;for(null==a&&(a=!1),f=this.files.slice(),d=0,e=f.length;e>d;d++)b=f[d],(b.status!==c.UPLOADING||a)&&this.removeFile(b);return null},c.prototype.createThumbnail=function(a,b){var c;return c=new FileReader,c.onload=function(d){return function(){return"image/svg+xml"===a.type?(d.emit("thumbnail",a,c.result),void(null!=b&&b())):d.createThumbnailFromUrl(a,c.result,b)}}(this),c.readAsDataURL(a)},c.prototype.createThumbnailFromUrl=function(a,b,c,d){var e;return e=document.createElement("img"),d&&(e.crossOrigin=d),e.onload=function(b){return function(){var d,g,h,i,j,k,l,m;return a.width=e.width,a.height=e.height,h=b.options.resize.call(b,a),null==h.trgWidth&&(h.trgWidth=h.optWidth),null==h.trgHeight&&(h.trgHeight=h.optHeight),d=document.createElement("canvas"),g=d.getContext("2d"),d.width=h.trgWidth,d.height=h.trgHeight,f(g,e,null!=(j=h.srcX)?j:0,null!=(k=h.srcY)?k:0,h.srcWidth,h.srcHeight,null!=(l=h.trgX)?l:0,null!=(m=h.trgY)?m:0,h.trgWidth,h.trgHeight),i=d.toDataURL("image/png"),b.emit("thumbnail",a,i),null!=c?c():void 0}}(this),null!=c&&(e.onerror=c),e.src=b},c.prototype.processQueue=function(){var a,b,c,d;if(b=this.options.parallelUploads,c=this.getUploadingFiles().length,a=c,!(c>=b)&&(d=this.getQueuedFiles(),d.length>0)){if(this.options.uploadMultiple)return this.processFiles(d.slice(0,b-c));for(;b>a;){if(!d.length)return;this.processFile(d.shift()),a++}}},c.prototype.processFile=function(a){return this.processFiles([a])},c.prototype.processFiles=function(a){var b,d,e;for(d=0,e=a.length;e>d;d++)b=a[d],b.processing=!0,b.status=c.UPLOADING,this.emit("processing",b);return this.options.uploadMultiple&&this.emit("processingmultiple",a),this.uploadFiles(a)},c.prototype._getFilesWithXhr=function(a){var b,c;return c=function(){var c,d,e,f;for(e=this.files,f=[],c=0,d=e.length;d>c;c++)b=e[c],b.xhr===a&&f.push(b);return f}.call(this)},c.prototype.cancelUpload=function(a){var b,d,e,f,g,h,i;if(a.status===c.UPLOADING){for(d=this._getFilesWithXhr(a.xhr),e=0,g=d.length;g>e;e++)b=d[e],b.status=c.CANCELED;for(a.xhr.abort(),f=0,h=d.length;h>f;f++)b=d[f],this.emit("canceled",b);this.options.uploadMultiple&&this.emit("canceledmultiple",d)}else((i=a.status)===c.ADDED||i===c.QUEUED)&&(a.status=c.CANCELED,this.emit("canceled",a),this.options.uploadMultiple&&this.emit("canceledmultiple",[a]));return this.options.autoProcessQueue?this.processQueue():void 0},e=function(){var a,b;return b=arguments[0],a=2<=arguments.length?i.call(arguments,1):[],"function"==typeof b?b.apply(this,a):b},c.prototype.uploadFile=function(a){return this.uploadFiles([a])},c.prototype.uploadFiles=function(a){var b,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,A,B,C,D,E,F,G,H,I,J,K,L;for(w=new XMLHttpRequest,x=0,B=a.length;B>x;x++)b=a[x],b.xhr=w;p=e(this.options.method,a),u=e(this.options.url,a),w.open(p,u,!0),w.withCredentials=!!this.options.withCredentials,s=null,g=function(c){return function(){var d,e,f;for(f=[],d=0,e=a.length;e>d;d++)b=a[d],f.push(c._errorProcessing(a,s||c.options.dictResponseError.replace("{{statusCode}}",w.status),w));return f}}(this),t=function(c){return function(d){var e,f,g,h,i,j,k,l,m;if(null!=d)for(f=100*d.loaded/d.total,g=0,j=a.length;j>g;g++)b=a[g],b.upload={progress:f,total:d.total,bytesSent:d.loaded};else{for(e=!0,f=100,h=0,k=a.length;k>h;h++)b=a[h],(100!==b.upload.progress||b.upload.bytesSent!==b.upload.total)&&(e=!1),b.upload.progress=f,b.upload.bytesSent=b.upload.total;if(e)return}for(m=[],i=0,l=a.length;l>i;i++)b=a[i],m.push(c.emit("uploadprogress",b,f,b.upload.bytesSent));return m}}(this),w.onload=function(b){return function(d){var e;if(a[0].status!==c.CANCELED&&4===w.readyState){if(s=w.responseText,w.getResponseHeader("content-type")&&~w.getResponseHeader("content-type").indexOf("application/json"))try{s=JSON.parse(s)}catch(f){d=f,s="Invalid JSON response from server."}return t(),200<=(e=w.status)&&300>e?b._finished(a,s,d):g()}}}(this),w.onerror=function(){return function(){return a[0].status!==c.CANCELED?g():void 0}}(this),r=null!=(G=w.upload)?G:w,r.onprogress=t,j={Accept:"application/json","Cache-Control":"no-cache","X-Requested-With":"XMLHttpRequest"},this.options.headers&&d(j,this.options.headers);for(h in j)i=j[h],i&&w.setRequestHeader(h,i);if(f=new FormData,this.options.params){H=this.options.params;for(o in H)v=H[o],f.append(o,v)}for(y=0,C=a.length;C>y;y++)b=a[y],this.emit("sending",b,w,f);if(this.options.uploadMultiple&&this.emit("sendingmultiple",a,w,f),"FORM"===this.element.tagName)for(I=this.element.querySelectorAll("input, textarea, select, button"),z=0,D=I.length;D>z;z++)if(l=I[z],m=l.getAttribute("name"),n=l.getAttribute("type"),"SELECT"===l.tagName&&l.hasAttribute("multiple"))for(J=l.options,A=0,E=J.length;E>A;A++)q=J[A],q.selected&&f.append(m,q.value);else(!n||"checkbox"!==(K=n.toLowerCase())&&"radio"!==K||l.checked)&&f.append(m,l.value);for(k=F=0,L=a.length-1;L>=0?L>=F:F>=L;k=L>=0?++F:--F)f.append(this._getParamName(k),a[k],this._renameFilename(a[k].name));return this.submitRequest(w,f,a)},c.prototype.submitRequest=function(a,b){return a.send(b)},c.prototype._finished=function(a,b,d){var e,f,g;for(f=0,g=a.length;g>f;f++)e=a[f],e.status=c.SUCCESS,this.emit("success",e,b,d),this.emit("complete",e);return this.options.uploadMultiple&&(this.emit("successmultiple",a,b,d),this.emit("completemultiple",a)),this.options.autoProcessQueue?this.processQueue():void 0},c.prototype._errorProcessing=function(a,b,d){var e,f,g;for(f=0,g=a.length;g>f;f++)e=a[f],e.status=c.ERROR,this.emit("error",e,b,d),this.emit("complete",e);return this.options.uploadMultiple&&(this.emit("errormultiple",a,b,d),this.emit("completemultiple",a)),this.options.autoProcessQueue?this.processQueue():void 0},c}(b),a.version="4.3.0",a.options={},a.optionsForElement=function(b){return b.getAttribute("id")?a.options[c(b.getAttribute("id"))]:void 0},a.instances=[],a.forElement=function(a){if("string"==typeof a&&(a=document.querySelector(a)),null==(null!=a?a.dropzone:void 0))throw new Error("No Dropzone found for given element. This is probably because you're trying to access it before Dropzone had the time to initialize. Use the `init` option to setup any additional observers on your Dropzone.");return a.dropzone},a.autoDiscover=!0,a.discover=function(){var b,c,d,e,f,g;for(document.querySelectorAll?d=document.querySelectorAll(".dropzone"):(d=[],b=function(a){var b,c,e,f;for(f=[],c=0,e=a.length;e>c;c++)b=a[c],f.push(/(^| )dropzone($| )/.test(b.className)?d.push(b):void 0);return f},b(document.getElementsByTagName("div")),b(document.getElementsByTagName("form"))),g=[],e=0,f=d.length;f>e;e++)c=d[e],g.push(a.optionsForElement(c)!==!1?new a(c):void 0);return g},a.blacklistedBrowsers=[/opera.*Macintosh.*version\/12/i],a.isBrowserSupported=function(){var b,c,d,e,f;if(b=!0,window.File&&window.FileReader&&window.FileList&&window.Blob&&window.FormData&&document.querySelector)if("classList"in document.createElement("a"))for(f=a.blacklistedBrowsers,d=0,e=f.length;e>d;d++)c=f[d],c.test(navigator.userAgent)&&(b=!1);else b=!1;else b=!1;return b},h=function(a,b){var c,d,e,f;for(f=[],d=0,e=a.length;e>d;d++)c=a[d],c!==b&&f.push(c);return f},c=function(a){return a.replace(/[\-_](\w)/g,function(a){return a.charAt(1).toUpperCase()})},a.createElement=function(a){var b;return b=document.createElement("div"),b.innerHTML=a,b.childNodes[0]},a.elementInside=function(a,b){if(a===b)return!0;for(;a=a.parentNode;)if(a===b)return!0;return!1},a.getElement=function(a,b){var c;if("string"==typeof a?c=document.querySelector(a):null!=a.nodeType&&(c=a),null==c)throw new Error("Invalid `"+b+"` option provided. Please provide a CSS selector or a plain HTML element.");return c},a.getElements=function(a,b){var c,d,e,f,g,h,i,j;if(a instanceof Array){e=[];try{for(f=0,h=a.length;h>f;f++)d=a[f],e.push(this.getElement(d,b))}catch(k){c=k,e=null}}else if("string"==typeof a)for(e=[],j=document.querySelectorAll(a),g=0,i=j.length;i>g;g++)d=j[g],e.push(d);else null!=a.nodeType&&(e=[a]);if(null==e||!e.length)throw new Error("Invalid `"+b+"` option provided. Please provide a CSS selector, a plain HTML element or a list of those.");return e},a.confirm=function(a,b,c){return window.confirm(a)?b():null!=c?c():void 0},a.isValidFile=function(a,b){var c,d,e,f,g;if(!b)return!0;for(b=b.split(","),d=a.type,c=d.replace(/\/.*$/,""),f=0,g=b.length;g>f;f++)if(e=b[f],e=e.trim(),"."===e.charAt(0)){if(-1!==a.name.toLowerCase().indexOf(e.toLowerCase(),a.name.length-e.length))return!0}else if(/\/\*$/.test(e)){if(c===e.replace(/\/.*$/,""))return!0
+}else if(d===e)return!0;return!1},"undefined"!=typeof jQuery&&null!==jQuery&&(jQuery.fn.dropzone=function(b){return this.each(function(){return new a(this,b)})}),"undefined"!=typeof module&&null!==module?module.exports=a:window.Dropzone=a,a.ADDED="added",a.QUEUED="queued",a.ACCEPTED=a.QUEUED,a.UPLOADING="uploading",a.PROCESSING=a.UPLOADING,a.CANCELED="canceled",a.ERROR="error",a.SUCCESS="success",e=function(a){var b,c,d,e,f,g,h,i,j,k;for(h=a.naturalWidth,g=a.naturalHeight,c=document.createElement("canvas"),c.width=1,c.height=g,d=c.getContext("2d"),d.drawImage(a,0,0),e=d.getImageData(0,0,1,g).data,k=0,f=g,i=g;i>k;)b=e[4*(i-1)+3],0===b?f=i:k=i,i=f+k>>1;return j=i/g,0===j?1:j},f=function(a,b,c,d,f,g,h,i,j,k){var l;return l=e(b),a.drawImage(b,c,d,f,g,h,i,j,k/l)},d=function(a,b){var c,d,e,f,g,h,i,j,k;if(e=!1,k=!0,d=a.document,j=d.documentElement,c=d.addEventListener?"addEventListener":"attachEvent",i=d.addEventListener?"removeEventListener":"detachEvent",h=d.addEventListener?"":"on",f=function(c){return"readystatechange"!==c.type||"complete"===d.readyState?(("load"===c.type?a:d)[i](h+c.type,f,!1),!e&&(e=!0)?b.call(a,c.type||c):void 0):void 0},g=function(){var a;try{j.doScroll("left")}catch(b){return a=b,void setTimeout(g,50)}return f("poll")},"complete"!==d.readyState){if(d.createEventObject&&j.doScroll){try{k=!a.frameElement}catch(l){}k&&g()}return d[c](h+"DOMContentLoaded",f,!1),d[c](h+"readystatechange",f,!1),a[c](h+"load",f,!1)}},a._autoDiscoverFunction=function(){return a.autoDiscover?a.discover():void 0},d(window,a._autoDiscoverFunction)}).call(this);
/*!
* typeahead.js 0.11.1
* https://github.com/twitter/typeahead.js
@@ -30482,6 +30484,11 @@ function calculateAmounts(invoice) {
var hasTaxes = false;
var taxes = {};
invoice.has_product_key = false;
+
+ // Bold designs currently breaks w/o the product column
+ if (invoice.invoice_design_id == 2) {
+ invoice.has_product_key = true;
+ }
// sum line item
for (var i=0; i"+this.options.dictFallbackText+"
"),d+='Posílejte klientům stejné faktury týdně, dvakrát za měsíc, měsíčně, čtvrtletně nebo ročně.
+Použijte :MONTH, :QUARTER or :YEAR pro dynamicky měnící se datumy. Funguje zde i základní matematika například, jako :MONTH-1.
+Příklady dynamických proměnných na faktuře:
+-
+
- "Členství v posilovně za :MONTH" => "Členství v posilovně za červenec" +
- ":YEAR+1 roční předplatné" => "2015 roční předplatné" +
- "Platba za :QUARTER+1" => "Platba za Q2" +
+ Další krokyFaktura k úhradě Vám byla zaslána na email spojený s tímto účtem. + Pro povolení všech skvělých profi vlastností si prosím přečtěte instrukce pro provedení platby na zaslané faktuře + pro roční využívání Profi plánu. + Nemůžete fakturu najít? Potřebujete pomoc? Rádi Vám pomůžeme na + -- emailu contact@invoiceninja.com', + 'unsaved_changes' => 'Máte neuložené změny', + 'custom_fields' => 'Volitelná pole', + 'company_fields' => 'Pole pro firmu', + 'client_fields' => 'Pole pro klienta', + 'field_label' => 'Popiska pole', + 'field_value' => 'Hodnota pole', + 'edit' => 'Editovat', + 'set_name' => 'Nastavit jméno vaší firmy', + 'view_as_recipient' => 'Vidět jako příjemce', + 'product_library' => 'Katalog produktů', + 'product' => 'Produkt', + 'products' => 'Katalog produktů', + 'fill_products' => 'Automaticky vyplnit produkty', + 'fill_products_help' => 'Výběr produktu automaticky vyplní popis a náklady', + 'update_products' => 'Automaticky měnit produkty', + 'update_products_help' => 'Změna na faktuře automaticky promítne do katalogu produktů', + 'create_product' => 'Přidat produkt', + 'edit_product' => 'Editovat produkt', + 'archive_product' => 'Archivovat produkt', + 'updated_product' => 'Úspěšně změněn produkt', + 'created_product' => 'Úspěšně vytvořen produkt', + 'archived_product' => 'Úspěšně archivován produkt', + 'pro_plan_custom_fields' => ':link pro nastavení volitelných polí připojením k Profi plánu', + 'advanced_settings' => 'Pokročilé nastavení', + 'pro_plan_advanced_settings' => ':link pro nastavení pokročilých nastavení připojením k Profi plánu', + 'invoice_design' => 'Vzhled faktur', + 'specify_colors' => 'Určete barvy', + 'specify_colors_label' => 'Zvolit barvy použité ve faktuře', + 'chart_builder' => 'Generování grafů', + 'ninja_email_footer' => 'Použijte :site k fakturaci Vašim klientům a nechte si platit online zdarma!', + 'go_pro' => 'Přejít na Profi', + 'quote' => 'Nabídka', + 'quotes' => 'Nabídky', + 'quote_number' => 'Číslo nabídky', + 'quote_number_short' => 'Nabídka #', + 'quote_date' => 'Datum nabídky', + 'quote_total' => 'Nabídek celkem', + 'your_quote' => 'Vaše nabídky', + 'total' => 'Celkem', + 'clone' => 'Duplikovat', + 'new_quote' => 'Nová nabídka', + 'create_quote' => 'Vytvořit nabídku', + 'edit_quote' => 'Editovat nabídku', + 'archive_quote' => 'Archivovat nabídku', + 'delete_quote' => 'Smazat nabídku', + 'save_quote' => 'Uložit nabídku', + 'email_quote' => 'Odeslat nabídku emailem', + 'clone_quote' => 'Duplikovat nabídku', + 'convert_to_invoice' => 'Změnit na fakturu', + 'view_invoice' => 'Zobrazit fakturu', + 'view_client' => 'Zobrazit klienta', + 'view_quote' => 'Zobrazit nabídku', + 'updated_quote' => 'Úspěšně změněna nabídka', + 'created_quote' => 'Úspěšně vytvořena nabídka', + 'cloned_quote' => 'Úspěšně zduplikována nabídka', + 'emailed_quote' => 'Úspěšně odeslána nabídka', + 'archived_quote' => 'Úspěšně archivována nabídka', + 'archived_quotes' => 'Úspěšně archiváno :count nabídek', + 'deleted_quote' => 'Úspěšně smazána nabídka', + 'deleted_quotes' => 'Úspěšně smazáno :count nabídek', + 'converted_to_invoice' => 'Úspěšně změněna nabídka na fakturu', + 'quote_subject' => 'Nová nabídka $quote od :account', + 'quote_message' => 'Pro zobrazení nabídky na :amount, klikněte na odkaz níže.', + 'quote_link_message' => 'Pro zobrazení nabídky pro vašeho klienta klikněte na odkaz níže:', + 'notification_quote_sent_subject' => 'Nabídka :invoice byla odeslána :client', + 'notification_quote_viewed_subject' => 'Nabídka :invoice byla zobrazena :client', + 'notification_quote_sent' => 'Klientovi :client byla emailem odeslána nabídka :invoice na :amount.', + 'notification_quote_viewed' => 'Klientovi :client se zobrazila nabídka :invoice na :amount.', + 'session_expired' => 'Vaše přihlášení expirovalo.', + 'invoice_fields' => 'Pole faktury', + 'invoice_options' => 'Možnosti faktury', + 'hide_quantity' => 'Skrýt množství', + 'hide_quantity_help' => 'Pokud množství v řádcích je vždy 1, tak můžete faktury zjednodušit vynecháním tohoto pole.', + 'hide_paid_to_date' => 'Skrýt Zaplaceno ke dni', + 'hide_paid_to_date_help' => 'Pouze zobrazte "Zaplaceno ke dni" na faktuře jakmile přijde platba.', + 'charge_taxes' => 'Použít daně', + 'user_management' => 'Správa uživatelů', + 'add_user' => 'Přidat uživatele', + 'send_invite' => 'Poslat pozvánku', + 'sent_invite' => 'Pozvánka úspěšně odeslána', + 'updated_user' => 'Uživatel úspěšně změněn', + 'invitation_message' => 'Byl(a) jste pozván(a) :invitor. ', + 'register_to_add_user' => 'Prosím zaregistrujte se jako uživatel', + 'user_state' => 'Stav', + 'edit_user' => 'Editovat uživatele', + 'delete_user' => 'Smazat uživatele', + 'active' => 'Aktivní', + 'pending' => 'Nevyřízený', + 'deleted_user' => 'Uživatel úspěšně smazán', + 'confirm_email_invoice' => 'Jste si jistí, že chcete poslat tuto fakturu emailem?', + 'confirm_email_quote' => 'Jste si jistí, že chcete poslat tuto nabídku emailem?', + 'confirm_recurring_email_invoice' => 'Jste si jistí, že chcete poslat tuto fakturu emailem?', + 'cancel_account' => 'Zrušit účet', + 'cancel_account_message' => 'Varování: Tento krok smaže navždy všechny vaše data, není zde žádná cesta zpět.', + 'go_back' => 'Jít zpět', + 'data_visualizations' => 'Vizualizace dat', + 'sample_data' => 'Zobrazit vzorová data', + 'hide' => 'Skrýt', + 'new_version_available' => 'Nová verze :releases_link je k dispozici. Nyní používáte :user_version, poslední je :latest_version', + 'invoice_settings' => 'Nastavení faktury', + 'invoice_number_prefix' => 'Nastavení prefixu čísla faktury', + 'invoice_number_counter' => 'Číselná řada faktur', + 'quote_number_prefix' => 'Prefix čísla nabídky', + 'quote_number_counter' => 'Číselná řada nabídek', + 'share_invoice_counter' => 'Sdílet číselnou řadu faktur', + 'invoice_issued_to' => 'Faktura vystavena', + 'invalid_counter' => 'Pro případný konflikt si raději nastavte prefix pro faktury nebo nabídky', + 'mark_sent' => 'Značka odesláno', + 'gateway_help_1' => ':link zaregistrovat se na Authorize.net.', + 'gateway_help_2' => ':link zaregistrovat se na Authorize.net.', + 'gateway_help_17' => ':link získat PayPal API signature.', + 'gateway_help_27' => ':link zaregistrovat se na TwoCheckout.', + 'more_designs' => 'Více vzhledů', + 'more_designs_title' => 'Další vzhledy faktur', + 'more_designs_cloud_header' => 'Přejděte na Profi plán pro více vzhledů faktur', + 'more_designs_cloud_text' => '', + 'more_designs_self_host_text' => '', + 'buy' => 'Buy', + 'bought_designs' => 'Další vzhledy faktur přidány', + 'sent' => 'sent', + 'vat_number' => 'DIČ', + 'timesheets' => 'Časové výkazy', + 'payment_title' => 'Zadejte Vaší fakturační adresu a informace o platební kartě', + 'payment_cvv' => '*To jsou 3-4 čísla na zadní straně Vaší karty', + 'payment_footer1' => '*Fakturační adresa musí sedět s tou uvedenou u platební karty.', + 'payment_footer2' => '*Prosím kliněte na "Zaplatit nyní " jenom jednou - transkace může trvat až 1 minutu.', + 'id_number' => 'Číslo ID', + 'white_label_link' => 'White label', + 'white_label_header' => 'White Label', + 'bought_white_label' => 'Úspěšně nastavena white label licence', + 'white_labeled' => 'White labeled', + 'restore' => 'Obnovit', + 'restore_invoice' => 'Obnovit fakturu', + 'restore_quote' => 'Obnovit nabídku', + 'restore_client' => 'Obnovit klienta', + 'restore_credit' => 'Obnovit kredit', + 'restore_payment' => 'Obnovit platbu', + 'restored_invoice' => 'Faktura úspěšně obnovena', + 'restored_quote' => 'Nabídka úspěšně obnovena', + 'restored_client' => 'Klient úspěšně obnoven', + 'restored_payment' => 'Platba úspěšně obnovena', + 'restored_credit' => 'Kredit úspěšně obnoven', + 'reason_for_canceling' => 'Když nám řeknete proč odcházíte, pomůžete nám zlepšit náš web. Děkujeme.', + 'discount_percent' => 'Procento', + 'discount_amount' => 'Částka', + 'invoice_history' => 'Historie faktur', + 'quote_history' => 'Historie nabídek', + 'current_version' => 'Současná verze', + 'select_versiony' => 'Zvolte verzi', + 'view_history' => 'Zobrazit historii', + 'edit_payment' => 'Editovat platbu', + 'updated_payment' => 'Platba úspěšně změněna', + 'deleted' => 'Smazáno', + 'restore_user' => 'Obnovit uživatele', + 'restored_user' => 'Uživatel úspěšně obnoven', + 'show_deleted_users' => 'Zobrazit smazané uživatele', + 'email_templates' => 'Emailové šablony', + 'invoice_email' => 'Email pro fakturu', + 'payment_email' => 'Email pro platbu', + 'quote_email' => 'Email pro nabídku', + 'reset_all' => 'Resetovat vše', + 'approve' => 'Schválit', + 'token_billing_type_id' => 'Token účtování', + 'token_billing_help' => 'Umožňuje ukládat platební karty ve vaší platební bráně a zatížit je platbou později.', + 'token_billing_1' => 'Vypnuto', + 'token_billing_2' => 'Opt-in - checkbox je zobrazen nezaškrtnutý', + 'token_billing_3' => 'Opt-out - je zobrazen zaškrtnutý', + 'token_billing_4' => 'Vždy', + 'token_billing_checkbox' => 'Ukládat detaily platební karty', + 'view_in_stripe' => 'Zobrazit ve Stripe', + 'use_card_on_file' => 'Použít uloženou kartu', + 'edit_payment_details' => 'Editovat platební údaje', + 'token_billing' => 'Ukládat platební údaje', + 'token_billing_secure' => 'Data jsou bezpečně uložena u :stripe_link', + 'support' => 'Popdora', + 'contact_information' => 'Kontaktní informace', + '256_encryption' => '256-Bitové šifrování', + 'amount_due' => 'Částka k platbě', + 'billing_address' => 'Fakturační adresa', + 'billing_method' => 'Způsob fakturace', + 'order_overview' => 'Přehled objednávky', + 'match_address' => '*Adresa musí odpovídat té uvedené na platební kartě.', + 'click_once' => '*Prosím klikněte na "Zaplatit nyní" pouze jednou - transkace může trvat až 1 minutu.', + 'invoice_footer' => 'Patička faktury', + 'save_as_default_footer' => 'Uložit jako výchozí patičku', + 'token_management' => 'Správa tokenů', + 'tokens' => 'Tokeny', + 'add_token' => 'Přidat token', + 'show_deleted_tokens' => 'Zobrazit smazané tokeny', + 'deleted_token' => 'Token úspěšně smazán', + 'created_token' => 'Token úspěšně vytvořen', + 'updated_token' => 'Token úspěšně změněn', + 'edit_token' => 'Editovat token', + 'delete_token' => 'Smazat Token', + 'token' => 'Token', + 'add_gateway' => 'Přidat platební bránu', + 'delete_gateway' => 'Smazat platební bránu', + 'edit_gateway' => 'Editovat bránu', + 'updated_gateway' => 'Brána úspěšně změněna', + 'created_gateway' => 'Brána úspěšně vytvořena', + 'deleted_gateway' => 'Brána úspěšně smazána', + 'pay_with_paypal' => 'PayPal', + 'pay_with_card' => 'Platební karty', + 'change_password' => 'Změnit heslo', + 'current_password' => 'Současné heslo', + 'new_password' => 'Nové heslo', + 'confirm_password' => 'Potvrdit heslo', + 'password_error_incorrect' => 'Současné heslo je neplatné.', + 'password_error_invalid' => 'Nové heslo je neplatné.', + 'updated_password' => 'Heslo úspěšně změněno', + 'api_tokens' => 'API Tokeny', + 'users_and_tokens' => 'Uživatelé & Tokeny', + 'account_login' => 'Přihlášení k účtu', + 'recover_password' => 'Obnovit vaše heslo', + 'forgot_password' => 'Zapomněli jste heslo?', + 'email_address' => 'Email', + 'lets_go' => 'Jdeme na to', + 'password_recovery' => 'Obnovení hesla', + 'send_email' => 'Poslat email', + 'set_password' => 'Nastavit heslo', + 'converted' => 'Zkonvertováno', + 'email_approved' => 'Odeslat email po schválení nabídky', + 'notification_quote_approved_subject' => 'Nabídka :invoice byla schválena :client', + 'notification_quote_approved' => 'Klient :client schválil nabídku :invoice na :amount.', + 'resend_confirmation' => 'Znovu poslat potvrzovací email', + 'confirmation_resent' => 'Potvrzení bylo odesláno emailem', + 'gateway_help_42' => ':link zaregistrujte se na BitPay.
Poznámka: použijte Legacy API Key, nikoliv API token.', + 'payment_type_credit_card' => 'Platební karty', + 'payment_type_paypal' => 'PayPal', + 'payment_type_bitcoin' => 'Bitcoin', + 'knowledge_base' => 'Knowledge Base', + 'partial' => 'Část', + 'partial_remaining' => ':partial z :balance', + 'more_fields' => 'Více polí', + 'less_fields' => 'Méně polí', + 'client_name' => 'Jméno klienta', + 'pdf_settings' => 'Nastavení PDF', + 'product_settings' => 'Nastavení produktu', + 'auto_wrap' => 'Automatické zalomení řádky', + 'duplicate_post' => 'Varování: předchozí stránka byla odeslána dvakrát. Druhé odeslání bylo ignorováno.', + 'view_documentation' => 'Zobrazit dokumentaci', + 'app_title' => 'Open source online fakrurace', + 'app_description' => 'Invoice Ninja je bezplatné open-source řešení pro fakturaci a účtování zákazníkům. + S Invoice Ninja, můžete jednoduše vytvářet a posílat hezké faktury z jakéhokoli zařízení, které má přístup na web. Vaši klienti si mohou faktury + vytisknout, stáhnout jako PDF nebo Vám rovnou online zaplatit.', + 'rows' => 'řádky', + 'www' => 'www', + 'logo' => 'Logo', + 'subdomain' => 'subdoména', + 'provide_name_or_email' => 'Prosím zadejte jméno nebo email', + 'charts_and_reports' => 'Grafy & Reporty', + 'chart' => 'Graf', + 'report' => 'Report', + 'group_by' => 'Seskupené podle', + 'paid' => 'Zaplacené', + 'enable_report' => 'Report', + 'enable_chart' => 'Graf', + 'totals' => 'Celkem', + 'run' => 'Běh', + 'export' => 'Export', + 'documentation' => 'Dokumentace', + 'zapier' => 'Zapier', + 'recurring' => 'Pravidelné', + 'last_invoice_sent' => 'Poslední faktura byla odeslána :date', + 'processed_updates' => 'Změna úspěšně provedena', + 'tasks' => 'Úlohy', + 'new_task' => 'Nový úloha', + 'start_time' => 'Počáteční čas', + 'created_task' => 'Úloha úspěšně vytvořena', + 'updated_task' => 'Úloha úspěšně změněna', + 'edit_task' => 'Editovat úlohu', + 'archive_task' => 'Archivovat úlohu', + 'restore_task' => 'Obnovit úlohu', + 'delete_task' => 'Smazat úlohu', + 'stop_task' => 'Zastavit úlohu', + 'time' => 'Čas', + 'start' => 'Začátek', + 'stop' => 'Konec', + 'now' => 'Nyní', + 'timer' => 'Časovač', + 'manual' => 'Manuální', + 'date_and_time' => 'Datum & Čas', + 'second' => 'vteřina', + 'seconds' => 'vteřin', + 'minute' => 'minuta', + 'minutes' => 'minut', + 'hour' => 'hodina', + 'hours' => 'hodiny', + 'task_details' => 'Detaily úlohy', + 'duration' => 'Trvání', + 'end_time' => 'Čas konce', + 'end' => 'Konec', + 'invoiced' => 'Fakturováno', + 'logged' => 'Přihlášen', + 'running' => 'Bežící', + 'task_error_multiple_clients' => 'Úloha nemůže být přiřazena různým klientům', + 'task_error_running' => 'Prosím zatavte napřed běžící úlohy', + 'task_error_invoiced' => 'Úlohy byly vyfakturovány', + 'restored_task' => 'Úloha úspěšně obnovena', + 'archived_task' => 'Úloha úspěšně archivována', + 'archived_tasks' => 'Úspěšně archivováno :count úloh', + 'deleted_task' => 'Úloha úspěšně smazána', + 'deleted_tasks' => 'Úspěšně smazáno :count úloh', + 'create_task' => 'Vytvořit úlohu', + 'stopped_task' => 'Úloha úspěšně zastavena', + 'invoice_task' => 'Fakturační úloha', + 'invoice_labels' => 'Fakturační popisky', + 'prefix' => 'Prefix', + 'counter' => 'Počítadlo', + 'payment_type_dwolla' => 'Dwolla', + 'gateway_help_43' => ':link zaregistrujte se na Dwolla', + 'partial_value' => 'Musí být větší než nula a méně než součet', + 'more_actions' => 'Více akcí', + 'pro_plan_title' => 'NINJA PROFI', + 'pro_plan_call_to_action' => 'Upgradujte nyní!', + 'pro_plan_feature1' => 'Neomezené množství klientů', + 'pro_plan_feature2' => 'Přístup k 10 nádherným šablonám faktur', + 'pro_plan_feature3' => 'Volitelné URLs - "vaseznacka.InvoiceNinja.com"', + 'pro_plan_feature4' => 'Odstranit "Vytvořeno Invoice Ninja"', + 'pro_plan_feature5' => 'Přístup více uživatelů & sledování aktivit', + 'pro_plan_feature6' => 'Vytváření nabídek & proforem', + 'pro_plan_feature7' => 'Úprava popisu polí faktur & číslování', + 'pro_plan_feature8' => 'Možnost připojit PDF soubor do emailu klientům', + 'resume' => 'Pokračovat', + 'break_duration' => 'Přestávka', + 'edit_details' => 'Editovat detaily', + 'work' => 'Práce', + 'timezone_unset' => 'Prosím :link nastavte si vaší časovou zónu', + 'click_here' => 'klikněte zde', + 'email_receipt' => 'Odeslat potvrzení platby klientovi', + 'created_payment_emailed_client' => 'ˇUspěšně vytvořena platba a odesláno info klientovi', + 'add_company' => 'Přidat firmu', + 'untitled' => 'Neoznačené', + 'new_company' => 'Nová firma', + 'associated_accounts' => 'Účty úspěšně spojeny', + 'unlinked_account' => 'Účty úspěšně rozspojeny', + 'login' => 'Přihlášení', + 'or' => 'nebo', + 'email_error' => 'Nastal problém s odesláním emailu', + 'confirm_recurring_timing' => 'Poznámka: Emaily jsou odesílány na záčátku hodiny.', + 'payment_terms_help' => 'Nastavte výchozí datum splatnosti', + 'unlink_account' => 'Odpojit účet', + 'unlink' => 'Odpojit', + 'show_address' => 'Ukázat adresu', + 'show_address_help' => 'Klient musí poskytnout fakturační adresu', + 'update_address' => 'Změnit adresu', + 'update_address_help' => 'Změnit adresu klienta podle poskytnutých detailů', + 'times' => 'Časy', + 'set_now' => 'Nastavit nyní', + 'dark_mode' => 'Tmavý mód', + 'dark_mode_help' => 'Zobrazit bílý text na černém pozadí', + 'add_to_invoice' => 'Přidat k faktuře :invoice', + 'create_new_invoice' => 'Vytvořit novou fakturu', + 'task_errors' => 'Prosím opravte překrývající se časy', + 'from' => 'Od', + 'to' => 'Komu', + 'font_size' => 'Velikost fontu', + 'primary_color' => 'Základní barva', + 'secondary_color' => 'Druhá barva', + 'customize_design' => 'Upravit design', + 'content' => 'Obsah', + 'styles' => 'Styly', + 'defaults' => 'Výchozí', + 'margins' => 'Marže', + 'header' => 'Hlavička', + 'footer' => 'Patička', + 'custom' => 'Volitelné', + 'invoice_to' => 'Fakturovat komu', + 'invoice_no' => 'Faktura č.', + 'recent_payments' => 'Poslední platby', + 'outstanding' => 'Nevyrovnaný', + 'manage_companies' => 'Spravovat firmy', + 'total_revenue' => 'Celkové příjmy', + 'current_user' => 'Aktuální uživatel', + 'new_recurring_invoice' => 'Nová pravidelná faktura', + 'recurring_invoice' => 'Pravidelná faktura', + 'recurring_too_soon' => 'Brzy se vytvoří další pravidelná faktura, je nastavena na :date', + 'created_by_invoice' => 'Vytvořeno :invoice', + 'primary_user' => 'Primární uživatel', + 'help' => 'Pomoc', + 'customize_help' => '
Používáme pdfmake pro definování vzhledu faktur. Pdfmake zkušebna poskytuje skvělou cestu jak knihovnu vidět v akci
+Pro přístup k podřízené položce se používá tečkové konvence. Například zobrazit pro zobrazení jména klienta použijte $client.name.
Pokud potřebujete s něčím pomoci - pošlete dotaz na náš fórum podpory.
', + 'invoice_due_date' => 'Datum splatnosti', + 'quote_due_date' => 'Platí do', + 'valid_until' => 'Platí do', + 'reset_terms' => 'Resetovat podmínky', + 'reset_footer' => 'Resetovat patičku', + 'invoices_sent' => ':count faktur sent|:count faktur odesláno', + 'status_draft' => 'Návrh', + 'status_sent' => 'Odesláno', + 'status_viewed' => 'Zobrazené', + 'status_partial' => 'Částečné', + 'status_paid' => 'Placené', + 'show_line_item_tax' => 'Zobrazit daně v řádku v položkách', + 'iframe_url' => 'Web', + 'iframe_url_help1' => 'Zkopírujte následující kód na Váš web.', + 'iframe_url_help2' => 'Tuto vlastnost můžete vyzkoušet kliknutím na \'Vidět jako příjemce\' jako fakturu.', + 'auto_bill' => 'Automatické fakturování', + 'military_time' => '24 hodinový čas', + 'last_sent' => 'Poslední odeslány', + 'reminder_emails' => 'Připomínky emailem', + 'templates_and_reminders' => 'Šablony & Připomínky', + 'subject' => 'Předmět', + 'body' => 'Tělo', + 'first_reminder' => 'První připomínka', + 'second_reminder' => 'Druhá připomínka', + 'third_reminder' => 'Třetí připomínka', + 'num_days_reminder' => 'Dny po splatnosti', + 'reminder_subject' => 'Připomínka: Faktura :invoice od :account', + 'reset' => 'Resetovat', + 'invoice_not_found' => 'Požadovaná faktura není k dispozici', + 'referral_program' => 'Referral program', + 'referral_code' => 'Referral URL', + 'last_sent_on' => 'Poslední odeslání: :date', + 'page_expire' => 'Tato stránka brzy expiruje, :click_here pro pokračování zobrazení', + 'upcoming_quotes' => 'Nadcházející nabídky', + 'expired_quotes' => 'Prošlé nabídky', + 'sign_up_using' => 'Zaregistrujte se pro použití', + 'invalid_credentials' => 'Tyto údaje neodpovídají našim záznamům.', + 'show_all_options' => 'Zobrazit všechny možnosti', + 'user_details' => 'Uživatelské detaily', + 'oneclick_login' => 'Přihlášení na 1 klik', + 'disable' => 'Vypnout', + 'invoice_quote_number' => 'Čísla faktur a nabídek', + 'invoice_charges' => 'Faktura poplatky', + 'notification_invoice_bounced' => 'Nebyli jsme schopni doručit fakturu :invoice na :contact.', + 'notification_invoice_bounced_subject' => 'Nebylo možné doručit fakturu :invoice', + 'notification_quote_bounced' => 'Nebyli jsme schopni doručit nabídku :invoice na :contact.', + 'notification_quote_bounced_subject' => 'Nebylo možné doručit nabídku :invoice', + 'custom_invoice_link' => 'Odkaz na fakturu', + 'total_invoiced' => 'Celkem fakturováno', + 'open_balance' => 'Zůstatek', + 'verify_email' => 'Prosím klikněte na odkaz v potvrzovacím emailu pro ověření správné adresy.', + 'basic_settings' => 'Základní nastavení', + 'pro' => 'Profi', + 'gateways' => 'Platební brány', + 'next_send_on' => 'Další odeslání: :date', + 'no_longer_running' => 'Tato faktura není nastavena aby proběhla', + 'general_settings' => 'Obecné nastavení', + 'customize' => 'Přizpůsobení', + 'oneclick_login_help' => 'Připojte si účet pro přihlášení bez použití hesla', + 'referral_code_help' => 'Vydělejte si peníze díky sdílení odkazu na naší aplikaci', + 'enable_with_stripe' => 'Povolit | Vyžaduje Stripe', + 'tax_settings' => 'Nastavení daní', + 'create_tax_rate' => 'Přidat daňovou sazbu', + 'updated_tax_rate' => 'Daňová sazba úspěšně změněna', + 'created_tax_rate' => 'Daňová sazba úspěšně vytvořena', + 'edit_tax_rate' => 'Editovat daňovou sazbu', + 'archive_tax_rate' => 'Archivovat daňovou sazbu', + 'archived_tax_rate' => 'Daňová sazba úspěšně archivována', + 'default_tax_rate_id' => 'Výchozí daňová sazba', + 'tax_rate' => 'Daňová sazba', + 'recurring_hour' => 'Pravidelná hodina', + 'pattern' => 'Vzorec', + 'pattern_help_title' => 'Pomoc se vzorcem', + 'pattern_help_1' => 'Vytvořte si čísla faktur a nabídek pomocí nastavení vzorce', + 'pattern_help_2' => 'Dostupné proměnné:', + 'pattern_help_3' => 'Například, :example může být konvertováno na :value', + 'see_options' => 'Zobrazit možnosti', + 'invoice_counter' => 'Počítadlo faktur', + 'quote_counter' => 'Počítadlo nabídek', + 'type' => 'Typ', + 'activity_1' => ':user vytvořil klienta :client', + 'activity_2' => ':user archivoval klienta :client', + 'activity_3' => ':user smazal klienta :client', + 'activity_4' => ':user vytvořil fakturu :invoice', + 'activity_5' => ':user změnil fakturu :invoice', + 'activity_6' => ':user odeslal fakturu :invoice to :contact', + 'activity_7' => ':contact zobrazil fakturu :invoice', + 'activity_8' => ':user archivoval fakturu :invoice', + 'activity_9' => ':user smazal fakturu :invoice', + 'activity_10' => ':contact zadal platbu :payment na :invoice', + 'activity_11' => ':user změnil platbu :payment', + 'activity_12' => ':user archivoval platbu :payment', + 'activity_13' => ':user smazal platbu :payment', + 'activity_14' => ':user zadal :credit kredit', + 'activity_15' => ':user změnil :credit kredit', + 'activity_16' => ':user archivoval :credit kredit', + 'activity_17' => ':user smazal :credit kredit', + 'activity_18' => ':user vytvořil nabídku :quote', + 'activity_19' => ':user změnil nabídku :quote', + 'activity_20' => ':user odeslal nabídku :quote to :contact', + 'activity_21' => ':contact zobrazil nabídku :quote', + 'activity_22' => ':user archivoval nabídku :quote', + 'activity_23' => ':user smazal nabídku :quote', + 'activity_24' => ':user obnovil nabídku :quote', + 'activity_25' => ':user obnovil fakturu :invoice', + 'activity_26' => ':user obnovil klienta :client', + 'activity_27' => ':user obnovil platbu :payment', + 'activity_28' => ':user obnovil :credit kredit', + 'activity_29' => ':contact schválil nabídku :quote', + 'activity_30' => ':user vytvořil :vendor', + 'activity_31' => ':user vytvořil :vendor', + 'activity_32' => ':user vytvořil :vendor', + 'activity_33' => ':user vytvořil :vendor', + 'activity_34' => ':user vytvořil výdaj :expense', + 'activity_35' => ':user vytvořil :vendor', + 'activity_36' => ':user vytvořil :vendor', + 'activity_37' => ':user vytvořil :vendor', + 'payment' => 'Platba', + 'system' => 'Systém', + 'signature' => 'Emailový podpis', + 'default_messages' => 'Výchozí vzkazy', + 'quote_terms' => 'Podmínky nabídky', + 'default_quote_terms' => 'Výchozí podmínky nabídky', + 'default_invoice_terms' => 'Výchozí fakturační podmínky', + 'default_invoice_footer' => 'Výchozí patička faktury', + 'quote_footer' => 'Patička nabídky', + 'free' => 'Zdarma', + 'quote_is_approved' => 'Tato nabídka je schválena', + 'apply_credit' => 'Použít kredit', + 'system_settings' => 'Nastavení systému', + 'archive_token' => 'Archivovat token', + 'archived_token' => 'Token úspěšně archivován', + 'archive_user' => 'Archivovaný uživatel', + 'archived_user' => 'Užival úspěšně archivován', + 'archive_account_gateway' => 'Archivovat bránu', + 'archived_account_gateway' => 'Brána úspěšně archivována', + 'archive_recurring_invoice' => 'Archivovat pravidelnou fakturu', + 'archived_recurring_invoice' => 'Pravidelná faktura úspěšně archivována', + 'delete_recurring_invoice' => 'Smazat pravidelnou fakturu', + 'deleted_recurring_invoice' => 'Pravidelná faktura smazána', + 'restore_recurring_invoice' => 'Obnovit pravidelnou fakturu', + 'restored_recurring_invoice' => 'Pravidelná faktura obnovena', + 'archived' => 'Archivováno', + 'untitled_account' => 'Společnost bez názvu', + 'before' => 'Před', + 'after' => 'Po', + 'reset_terms_help' => 'Resetovat na výchozí podmínky účtu', + 'reset_footer_help' => 'Resetovat na výchozí hlavičku účtu', + 'export_data' => 'Exportovat data', + 'user' => 'Uživatel', + 'country' => 'Země', + 'include' => 'Zahrnout', + 'logo_too_large' => 'Vaše logo je :size, pro rychlejší zobrazení v PDF navrhujeme nahrát soubor menší než 200KB', + 'import_freshbooks' => 'Importovat z FreshBooks', + 'import_data' => 'Importovat data', + 'source' => 'Zdroj', + 'csv' => 'CSV', + 'client_file' => 'Soubor s klienty', + 'invoice_file' => 'Soubor s fakturami', + 'task_file' => 'Soubor s úlohami', + 'no_mapper' => 'Mapování pro soubor není k dispozici', + 'invalid_csv_header' => 'Naplatná hlavička v CSV souboru', + 'client_portal' => 'Klientský portál', + 'admin' => 'Administrátor', + 'disabled' => 'Nepovolen', + 'show_archived_users' => 'Zobrazit archivované uživatele', + 'notes' => 'Poznámky', + 'invoice_will_create' => 'klient bude vytvořen', + 'invoices_will_create' => 'faktury budou vytvořeny', + 'failed_to_import' => 'Následující záznamy selhaly u importu, buď již existují nebo nemají požadovaná pole.', + 'publishable_key' => 'Veřejný klíč', + 'secret_key' => 'Tajný klíč', + 'missing_publishable_key' => 'Nastavte veřejný klíč Stripe pro lepší proces platby', + 'email_design' => 'Vzhled emailu', + 'due_by' => 'Splatnost do :date', + 'enable_email_markup' => 'Umožnit mikroznačky', + 'enable_email_markup_help' => 'Přidejte si mikroznačky schema.org do emailu a usnadněte tak vašim klientům platby.', + 'template_help_title' => 'Nápověda k šablonám', + 'template_help_1' => 'Dostupné proměnné:', + 'email_design_id' => 'Styl emailu', + 'email_design_help' => 'Vytvořte si profesionální vzhled emailů pomocí HTML', + 'plain' => 'Prostý text', + 'light' => 'Světlý', + 'dark' => 'Tmavý', + 'industry_help' => 'Používá se pro porovnání proti průměru u firem podobné velikosti a podobného odvětví.', + 'subdomain_help' => 'Upravte si subdoménu odkazu na fakturu nebo zobrazte faktury na Vašem vlastním webu.', + 'invoice_number_help' => 'Určete prefix nebo použijte upravitelný vzorec pro nastavení číslování faktur.', + 'quote_number_help' => 'Určete prefix nebo použijte upravitelný vzorec pro nastavení číslování nabídek.', + 'custom_client_fields_helps' => 'Když vytváříte klienta - přidejte nové pole a jeho popis a hodnotu pro zobrazení v PDF.', + 'custom_account_fields_helps' => 'Přidejte si pole a hodnotu k detailům společnosti na PDF.', + 'custom_invoice_fields_helps' => 'Přidejte si nové pole když vytváříte fakturu a zobrazte si jeho popis a hodnotu v PDF.', + 'custom_invoice_charges_helps' => 'Přidejte si pole během vytváření faktury a zahrňte ho mezi poplatky do faktury.', + 'token_expired' => 'Validační token expiroval. Prosím vyzkoušejte znovu.', + 'invoice_link' => 'Odkaz na fakturu', + 'button_confirmation_message' => 'Klikněte pro potvrzení Vaší emailové adresy.', + 'confirm' => 'Potvrzuji', + 'email_preferences' => 'Email preference', + 'created_invoices' => 'Úspěšně vytvořeno :count faktur', + 'next_invoice_number' => 'Další číslo faktury je :number.', + 'next_quote_number' => 'Další číslo nabídky je :number.', + 'days_before' => 'dní před', + 'days_after' => 'dní po', + 'field_due_date' => 'datum splatnosti', + 'field_invoice_date' => 'datum vystavení', + 'schedule' => 'Rozvrh', + 'email_designs' => 'Vzhled emailů', + 'assigned_when_sent' => 'Přiřazeno při odeslání', + 'white_label_purchase_link' => 'Zakoupit white label licenci', + 'expense' => 'Náklad', + 'expenses' => 'Náklady', + 'new_expense' => 'Nový náklad', + 'enter_expense' => 'Zadat náklad', + 'vendors' => 'Dodavatelé', + 'new_vendor' => 'Nový dodavatel', + 'payment_terms_net' => 'Net', + 'vendor' => 'Dodavatel', + 'edit_vendor' => 'Editovat dodavatele', + 'archive_vendor' => 'Archivovat dodavatele', + 'delete_vendor' => 'Smazat dodavatele', + 'view_vendor' => 'Zobrazit dodavatele', + 'deleted_expense' => 'Náklad úspěšně smazán', + 'archived_expense' => 'Náklad úspěšně archivován', + 'deleted_expenses' => 'Náklad úspěšně smazán', + 'archived_expenses' => 'Náklady úspěšně archivovány', + 'expense_amount' => 'Částka nákladů', + 'expense_balance' => 'Zůstatek nákladů', + 'expense_date' => 'Datum nákladu', + 'expense_should_be_invoiced' => 'Má tento náklad být fakturován?', + 'public_notes' => 'Veřejné poznámky', + 'invoice_amount' => 'Částka faktury', + 'exchange_rate' => 'Měnový kurz', + 'yes' => 'Ano', + 'no' => 'Ne', + 'should_be_invoiced' => 'Má být fakturován', + 'view_expense' => 'Zobrazit náklad # :expense', + 'edit_expense' => 'Editovat náklad', + 'archive_expense' => 'Archivovat náklad', + 'delete_expense' => 'Smazat náklad', + 'view_expense_num' => 'Náklad # :expense', + 'updated_expense' => 'Náklad úspěšně změněn', + 'created_expense' => 'Náklad úspěšně vytvořen', + 'enter_expense' => 'Zadat náklady', + 'view' => 'Zobrazit', + 'restore_expense' => 'Obnovit náklady', + 'invoice_expense' => 'Fakturovat náklady', + 'expense_error_multiple_clients' => 'Náklady nemohou patřit různým klientům', + 'expense_error_invoiced' => 'Náklady byly již vyfakturovány', + 'convert_currency' => 'Zkonvertovat měnu', + 'num_days' => 'Počet dnů', + 'create_payment_term' => 'Vytvořit platební podmínky', + 'edit_payment_terms' => 'Editovat platební podmínky', + 'edit_payment_term' => 'Editovat platební podmínky', + 'archive_payment_term' => 'Archivovat platební podmínky', + 'recurring_due_dates' => 'Datumy splatnosti pravidelných faktur', + 'recurring_due_date_help' => 'Automaticky nastavit datum splatnosti na fakturách
+U faktury s měsíčním nebo ročním cyklem bude nastavena měsíční splatnost v dalším měsíci. Invoices on a monthly or yearly cycle set to be due on or before the day they are created will be due the next month. + Faktury se splatností k 29. nebo 30 v měsících, které tyto dny nemají se splatnost nastaví k poslednímu dni v měsíci.
+Faktury s týdenním cyklem mají jako výchozí týdenní splatnost.
+Například:
+-
+
- Dnes je 15tého, datum splatnosti je 1.den v měsíci. Datum splatnosti tedy bude prvního dne další měsíc. +
- Dnes je 15tého, datum splatnosti je poslední datum v měsíci. Datum splatnosti bude tedy poslední den v tomto měsíci. + +
- Dnes je 15tého , datum splatnosti je nastaven na 15. den v měsíci. Datum splatnosti tedy bude 15tého další měsíc. + +
- Dnes je pátek, datum splatnosti je nastaveno na první pátek za týden. Datum splatnosti bude tedy další pátek, nikoliv dnes. + +
Next StepsA payable invoice has been sent to the email address associated with your account. To unlock all of the awesome @@ -368,7 +367,7 @@ $LANG = array( 'confirm_email_invoice' => 'Are you sure you want to email this invoice?', 'confirm_email_quote' => 'Are you sure you want to email this quote?', 'confirm_recurring_email_invoice' => 'Are you sure you want this invoice emailed?', - 'cancel_account' => 'Cancel Account', + 'cancel_account' => 'Delete Account', 'cancel_account_message' => 'Warning: This will permanently erase all of your data, there is no undo.', 'go_back' => 'Go Back', 'data_visualizations' => 'Data Visualizations', @@ -424,7 +423,7 @@ $LANG = array( 'invoice_history' => 'Invoice History', 'quote_history' => 'Quote History', 'current_version' => 'Current version', - 'select_versiony' => 'Select version', + 'select_version' => 'Select version', 'view_history' => 'View History', 'edit_payment' => 'Edit Payment', 'updated_payment' => 'Successfully updated payment', @@ -976,9 +975,9 @@ $LANG = array( 'expense_error_mismatch_currencies' => 'The client\'s currency does not match the expense currency.', 'trello_roadmap' => 'Trello Roadmap', 'header_footer' => 'Header/Footer', - 'first_page' => 'first page', - 'all_pages' => 'all pages', - 'last_page' => 'last page', + 'first_page' => 'First page', + 'all_pages' => 'All pages', + 'last_page' => 'Last page', 'all_pages_header' => 'Show header on', 'all_pages_footer' => 'Show footer on', 'invoice_currency' => 'Invoice Currency', @@ -1049,8 +1048,6 @@ $LANG = array( 'custom_invoice_item_fields_help' => 'Add a field when creating an invoice item and display the label and value on the PDF.', 'recurring_invoice_number' => 'Recurring Invoice Number', 'recurring_invoice_number_prefix_help' => 'Speciy a prefix to be added to the invoice number for recurring invoices. The default value is \'R\'.', - 'enable_client_portal' => 'Dashboard', - 'enable_client_portal_help' => 'Show/hide the dashboard page in the client portal.', // Client Passwords 'enable_portal_password'=>'Password protect invoices', @@ -1097,6 +1094,94 @@ $LANG = array( 'november' => 'November', 'december' => 'December', + // Documents + 'documents_header' => 'Documents:', + 'email_documents_header' => 'Documents:', + 'email_documents_example_1' => 'Widgets Receipt.pdf', + 'email_documents_example_2' => 'Final Deliverable.zip', + 'invoice_documents' => 'Documents', + 'expense_documents' => 'Attached Documents', + 'invoice_embed_documents' => 'Embed Documents', + 'invoice_embed_documents_help' => 'Include attached images in the invoice.', + 'document_email_attachment' => 'Attach Documents', + 'download_documents' => 'Download Documents (:size)', + 'documents_from_expenses' => 'From Expenses:', + 'dropzone' => array(// See http://www.dropzonejs.com/#config-dictDefaultMessage + 'DefaultMessage' => 'Drop files or click to upload', + 'FallbackMessage' => 'Your browser does not support drag\'n\'drop file uploads.', + 'FallbackText' => 'Please use the fallback form below to upload your files like in the olden days.', + 'FileTooBig' => 'File is too big ({{filesize}}MiB). Max filesize: {{maxFilesize}}MiB.', + 'InvalidFileType' => 'You can\'t upload files of this type.', + 'ResponseError' => 'Server responded with {{statusCode}} code.', + 'CancelUpload' => 'Cancel upload', + 'CancelUploadConfirmation' => 'Are you sure you want to cancel this upload?', + 'RemoveFile' => 'Remove file', + ), + 'documents' => 'Documents', + 'document_date' => 'Document Date', + 'document_size' => 'Size', + + 'enable_client_portal' => 'Client Portal', + 'enable_client_portal_help' => 'Show/hide the client portal.', + 'enable_client_portal_dashboard' => 'Dashboard', + 'enable_client_portal_dashboard_help' => 'Show/hide the dashboard page in the client portal.', + + // Plans + 'account_management' => 'Account Management', + 'plan_status' => 'Plan Status', + + 'plan_upgrade' => 'Upgrade', + 'plan_change' => 'Change Plan', + 'pending_change_to' => 'Changes To', + 'plan_changes_to' => ':plan on :date', + 'plan_term_changes_to' => ':plan (:term) on :date', + 'cancel_plan_change' => 'Cancel Change', + 'plan' => 'Plan', + 'expires' => 'Expires', + 'renews' => 'Renews', + 'plan_expired' => ':plan Plan Expired', + 'trial_expired' => ':plan Plan Trial Ended', + 'never' => 'Never', + 'plan_free' => 'Free', + 'plan_pro' => 'Pro', + 'plan_enterprise' => 'Enterprise', + 'plan_white_label' => 'Self Hosted (White labeled)', + 'plan_free_self_hosted' => 'Self Hosted (Free)', + 'plan_trial' => 'Trial', + 'plan_term' => 'Term', + 'plan_term_monthly' => 'Monthly', + 'plan_term_yearly' => 'Yearly', + 'plan_term_month' => 'Month', + 'plan_term_year' => 'Year', + 'plan_price_monthly' => '$:price/Month', + 'plan_price_yearly' => '$:price/Year', + 'updated_plan' => 'Updated plan settings', + 'plan_paid' => 'Term Started', + 'plan_started' => 'Plan Started', + 'plan_expires' => 'Plan Expires', + + 'white_label_button' => 'White Label', + + 'pro_plan_year_description' => 'One year enrollment in the Invoice Ninja Pro Plan.', + 'pro_plan_month_description' => 'One month enrollment in the Invoice Ninja Pro Plan.', + 'enterprise_plan_product' => 'Enterprise Plan', + 'enterprise_plan_year_description' => 'One year enrollment in the Invoice Ninja Enterprise Plan.', + 'enterprise_plan_month_description' => 'One month enrollment in the Invoice Ninja Enterprise Plan.', + 'plan_credit_product' => 'Credit', + 'plan_credit_description' => 'Credit for unused time', + 'plan_pending_monthly' => 'Will switch to monthly on :date', + 'plan_refunded' => 'A refund has been issued.', + + 'live_preview' => 'Live Preview', + 'page_size' => 'Page Size', + 'live_preview_disabled' => 'Live preview has been disabled to support selected font', + 'invoice_number_padding' => 'Padding', + 'preview' => 'Preview', + 'list_vendors' => 'List Vendors', + 'add_users_not_supported' => 'Upgrade to the Enterprise plan to add additional users to your account.', + 'enterprise_plan_features' => 'The Enterprise plan adds support for multiple users and file attachments.', + 'return_to_app' => 'Return to app', + ); return $LANG; diff --git a/resources/lang/es/texts.php b/resources/lang/es/texts.php index 75bd1a75dae6..eccabaf4a620 100644 --- a/resources/lang/es/texts.php +++ b/resources/lang/es/texts.php @@ -466,7 +466,7 @@ return array( 'invoice_history' => 'Facturar Historial', 'quote_history' => 'Cotizar Historial', 'current_version' => 'Versión actual', - 'select_versiony' => 'Seleccionar versión', + 'select_version' => 'Seleccionar versión', 'view_history' => 'Ver Historial', 'edit_payment' => 'Editar Pago', @@ -1177,4 +1177,92 @@ return array( 'november' => 'November', 'december' => 'December', + // Documents + 'documents_header' => 'Documents:', + 'email_documents_header' => 'Documents:', + 'email_documents_example_1' => 'Widgets Receipt.pdf', + 'email_documents_example_2' => 'Final Deliverable.zip', + 'invoice_documents' => 'Documents', + 'expense_documents' => 'Attached Documents', + 'invoice_embed_documents' => 'Embed Documents', + 'invoice_embed_documents_help' => 'Include attached images in the invoice.', + 'document_email_attachment' => 'Attach Documents', + 'download_documents' => 'Download Documents (:size)', + 'documents_from_expenses' => 'From Expenses:', + 'dropzone' => array(// See http://www.dropzonejs.com/#config-dictDefaultMessage + 'DefaultMessage' => 'Drop files or click to upload', + 'FallbackMessage' => 'Your browser does not support drag\'n\'drop file uploads.', + 'FallbackText' => 'Please use the fallback form below to upload your files like in the olden days.', + 'FileTooBig' => 'File is too big ({{filesize}}MiB). Max filesize: {{maxFilesize}}MiB.', + 'InvalidFileType' => 'You can\'t upload files of this type.', + 'ResponseError' => 'Server responded with {{statusCode}} code.', + 'CancelUpload' => 'Cancel upload', + 'CancelUploadConfirmation' => 'Are you sure you want to cancel this upload?', + 'RemoveFile' => 'Remove file', + ), + 'documents' => 'Documents', + 'document_date' => 'Document Date', + 'document_size' => 'Size', + + 'enable_client_portal' => 'Client Portal', + 'enable_client_portal_help' => 'Show/hide the client portal.', + 'enable_client_portal_dashboard' => 'Dashboard', + 'enable_client_portal_dashboard_help' => 'Show/hide the dashboard page in the client portal.', + + // Plans + 'account_management' => 'Account Management', + 'plan_status' => 'Plan Status', + + 'plan_upgrade' => 'Upgrade', + 'plan_change' => 'Change Plan', + 'pending_change_to' => 'Changes To', + 'plan_changes_to' => ':plan on :date', + 'plan_term_changes_to' => ':plan (:term) on :date', + 'cancel_plan_change' => 'Cancel Change', + 'plan' => 'Plan', + 'expires' => 'Expires', + 'renews' => 'Renews', + 'plan_expired' => ':plan Plan Expired', + 'trial_expired' => ':plan Plan Trial Ended', + 'never' => 'Never', + 'plan_free' => 'Free', + 'plan_pro' => 'Pro', + 'plan_enterprise' => 'Enterprise', + 'plan_white_label' => 'Self Hosted (White labeled)', + 'plan_free_self_hosted' => 'Self Hosted (Free)', + 'plan_trial' => 'Trial', + 'plan_term' => 'Term', + 'plan_term_monthly' => 'Monthly', + 'plan_term_yearly' => 'Yearly', + 'plan_term_month' => 'Month', + 'plan_term_year' => 'Year', + 'plan_price_monthly' => '$:price/Month', + 'plan_price_yearly' => '$:price/Year', + 'updated_plan' => 'Updated plan settings', + 'plan_paid' => 'Term Started', + 'plan_started' => 'Plan Started', + 'plan_expires' => 'Plan Expires', + + 'white_label_button' => 'White Label', + + 'pro_plan_year_description' => 'One year enrollment in the Invoice Ninja Pro Plan.', + 'pro_plan_month_description' => 'One month enrollment in the Invoice Ninja Pro Plan.', + 'enterprise_plan_product' => 'Enterprise Plan', + 'enterprise_plan_year_description' => 'One year enrollment in the Invoice Ninja Enterprise Plan.', + 'enterprise_plan_month_description' => 'One month enrollment in the Invoice Ninja Enterprise Plan.', + 'plan_credit_product' => 'Credit', + 'plan_credit_description' => 'Credit for unused time', + 'plan_pending_monthly' => 'Will switch to monthly on :date', + 'plan_refunded' => 'A refund has been issued.', + + 'live_preview' => 'Live Preview', + 'page_size' => 'Page Size', + 'live_preview_disabled' => 'Live preview has been disabled to support selected font', + 'invoice_number_padding' => 'Padding', + 'preview' => 'Preview', + 'list_vendors' => 'List Vendors', + 'add_users_not_supported' => 'Upgrade to the Enterprise plan to add additional users to your account.', + 'enterprise_plan_features' => 'The Enterprise plan adds support for multiple users and file attachments.', + 'return_to_app' => 'Return to app', + ); diff --git a/resources/lang/es_ES/texts.php b/resources/lang/es_ES/texts.php index 25054072dac5..d6aa9f0aa6b6 100644 --- a/resources/lang/es_ES/texts.php +++ b/resources/lang/es_ES/texts.php @@ -486,7 +486,7 @@ return array( 'invoice_history' => 'Historial de Facturas', 'quote_history' => 'Historial de Presupuestos', 'current_version' => 'Versión Actual', - 'select_versiony' => 'Seleccione la Versión', + 'select_version' => 'Seleccione la Versión', 'view_history' => 'Ver Historial', 'edit_payment' => 'Editar Pago', @@ -1197,4 +1197,92 @@ return array( 'november' => 'November', 'december' => 'December', + // Documents + 'documents_header' => 'Documents:', + 'email_documents_header' => 'Documents:', + 'email_documents_example_1' => 'Widgets Receipt.pdf', + 'email_documents_example_2' => 'Final Deliverable.zip', + 'invoice_documents' => 'Documents', + 'expense_documents' => 'Attached Documents', + 'invoice_embed_documents' => 'Embed Documents', + 'invoice_embed_documents_help' => 'Include attached images in the invoice.', + 'document_email_attachment' => 'Attach Documents', + 'download_documents' => 'Download Documents (:size)', + 'documents_from_expenses' => 'From Expenses:', + 'dropzone' => array(// See http://www.dropzonejs.com/#config-dictDefaultMessage + 'DefaultMessage' => 'Drop files or click to upload', + 'FallbackMessage' => 'Your browser does not support drag\'n\'drop file uploads.', + 'FallbackText' => 'Please use the fallback form below to upload your files like in the olden days.', + 'FileTooBig' => 'File is too big ({{filesize}}MiB). Max filesize: {{maxFilesize}}MiB.', + 'InvalidFileType' => 'You can\'t upload files of this type.', + 'ResponseError' => 'Server responded with {{statusCode}} code.', + 'CancelUpload' => 'Cancel upload', + 'CancelUploadConfirmation' => 'Are you sure you want to cancel this upload?', + 'RemoveFile' => 'Remove file', + ), + 'documents' => 'Documents', + 'document_date' => 'Document Date', + 'document_size' => 'Size', + + 'enable_client_portal' => 'Client Portal', + 'enable_client_portal_help' => 'Show/hide the client portal.', + 'enable_client_portal_dashboard' => 'Dashboard', + 'enable_client_portal_dashboard_help' => 'Show/hide the dashboard page in the client portal.', + + // Plans + 'account_management' => 'Account Management', + 'plan_status' => 'Plan Status', + + 'plan_upgrade' => 'Upgrade', + 'plan_change' => 'Change Plan', + 'pending_change_to' => 'Changes To', + 'plan_changes_to' => ':plan on :date', + 'plan_term_changes_to' => ':plan (:term) on :date', + 'cancel_plan_change' => 'Cancel Change', + 'plan' => 'Plan', + 'expires' => 'Expires', + 'renews' => 'Renews', + 'plan_expired' => ':plan Plan Expired', + 'trial_expired' => ':plan Plan Trial Ended', + 'never' => 'Never', + 'plan_free' => 'Free', + 'plan_pro' => 'Pro', + 'plan_enterprise' => 'Enterprise', + 'plan_white_label' => 'Self Hosted (White labeled)', + 'plan_free_self_hosted' => 'Self Hosted (Free)', + 'plan_trial' => 'Trial', + 'plan_term' => 'Term', + 'plan_term_monthly' => 'Monthly', + 'plan_term_yearly' => 'Yearly', + 'plan_term_month' => 'Month', + 'plan_term_year' => 'Year', + 'plan_price_monthly' => '$:price/Month', + 'plan_price_yearly' => '$:price/Year', + 'updated_plan' => 'Updated plan settings', + 'plan_paid' => 'Term Started', + 'plan_started' => 'Plan Started', + 'plan_expires' => 'Plan Expires', + + 'white_label_button' => 'White Label', + + 'pro_plan_year_description' => 'One year enrollment in the Invoice Ninja Pro Plan.', + 'pro_plan_month_description' => 'One month enrollment in the Invoice Ninja Pro Plan.', + 'enterprise_plan_product' => 'Enterprise Plan', + 'enterprise_plan_year_description' => 'One year enrollment in the Invoice Ninja Enterprise Plan.', + 'enterprise_plan_month_description' => 'One month enrollment in the Invoice Ninja Enterprise Plan.', + 'plan_credit_product' => 'Credit', + 'plan_credit_description' => 'Credit for unused time', + 'plan_pending_monthly' => 'Will switch to monthly on :date', + 'plan_refunded' => 'A refund has been issued.', + + 'live_preview' => 'Live Preview', + 'page_size' => 'Page Size', + 'live_preview_disabled' => 'Live preview has been disabled to support selected font', + 'invoice_number_padding' => 'Padding', + 'preview' => 'Preview', + 'list_vendors' => 'List Vendors', + 'add_users_not_supported' => 'Upgrade to the Enterprise plan to add additional users to your account.', + 'enterprise_plan_features' => 'The Enterprise plan adds support for multiple users and file attachments.', + 'return_to_app' => 'Return to app', + ); diff --git a/resources/lang/fr/texts.php b/resources/lang/fr/texts.php index 89f323a6f6e7..10d994d8d894 100644 --- a/resources/lang/fr/texts.php +++ b/resources/lang/fr/texts.php @@ -1192,4 +1192,92 @@ return array( 'november' => 'Novembre', 'december' => 'Décembre', + // Documents + 'documents_header' => 'Documents:', + 'email_documents_header' => 'Documents:', + 'email_documents_example_1' => 'Widgets Receipt.pdf', + 'email_documents_example_2' => 'Final Deliverable.zip', + 'invoice_documents' => 'Documents', + 'expense_documents' => 'Attached Documents', + 'invoice_embed_documents' => 'Embed Documents', + 'invoice_embed_documents_help' => 'Include attached images in the invoice.', + 'document_email_attachment' => 'Attach Documents', + 'download_documents' => 'Download Documents (:size)', + 'documents_from_expenses' => 'From Expenses:', + 'dropzone' => array(// See http://www.dropzonejs.com/#config-dictDefaultMessage + 'DefaultMessage' => 'Drop files or click to upload', + 'FallbackMessage' => 'Your browser does not support drag\'n\'drop file uploads.', + 'FallbackText' => 'Please use the fallback form below to upload your files like in the olden days.', + 'FileTooBig' => 'File is too big ({{filesize}}MiB). Max filesize: {{maxFilesize}}MiB.', + 'InvalidFileType' => 'You can\'t upload files of this type.', + 'ResponseError' => 'Server responded with {{statusCode}} code.', + 'CancelUpload' => 'Cancel upload', + 'CancelUploadConfirmation' => 'Are you sure you want to cancel this upload?', + 'RemoveFile' => 'Remove file', + ), + 'documents' => 'Documents', + 'document_date' => 'Document Date', + 'document_size' => 'Size', + + 'enable_client_portal' => 'Client Portal', + 'enable_client_portal_help' => 'Show/hide the client portal.', + 'enable_client_portal_dashboard' => 'Dashboard', + 'enable_client_portal_dashboard_help' => 'Show/hide the dashboard page in the client portal.', + + // Plans + 'account_management' => 'Account Management', + 'plan_status' => 'Plan Status', + + 'plan_upgrade' => 'Upgrade', + 'plan_change' => 'Change Plan', + 'pending_change_to' => 'Changes To', + 'plan_changes_to' => ':plan on :date', + 'plan_term_changes_to' => ':plan (:term) on :date', + 'cancel_plan_change' => 'Cancel Change', + 'plan' => 'Plan', + 'expires' => 'Expires', + 'renews' => 'Renews', + 'plan_expired' => ':plan Plan Expired', + 'trial_expired' => ':plan Plan Trial Ended', + 'never' => 'Never', + 'plan_free' => 'Free', + 'plan_pro' => 'Pro', + 'plan_enterprise' => 'Enterprise', + 'plan_white_label' => 'Self Hosted (White labeled)', + 'plan_free_self_hosted' => 'Self Hosted (Free)', + 'plan_trial' => 'Trial', + 'plan_term' => 'Term', + 'plan_term_monthly' => 'Monthly', + 'plan_term_yearly' => 'Yearly', + 'plan_term_month' => 'Month', + 'plan_term_year' => 'Year', + 'plan_price_monthly' => '$:price/Month', + 'plan_price_yearly' => '$:price/Year', + 'updated_plan' => 'Updated plan settings', + 'plan_paid' => 'Term Started', + 'plan_started' => 'Plan Started', + 'plan_expires' => 'Plan Expires', + + 'white_label_button' => 'White Label', + + 'pro_plan_year_description' => 'One year enrollment in the Invoice Ninja Pro Plan.', + 'pro_plan_month_description' => 'One month enrollment in the Invoice Ninja Pro Plan.', + 'enterprise_plan_product' => 'Enterprise Plan', + 'enterprise_plan_year_description' => 'One year enrollment in the Invoice Ninja Enterprise Plan.', + 'enterprise_plan_month_description' => 'One month enrollment in the Invoice Ninja Enterprise Plan.', + 'plan_credit_product' => 'Credit', + 'plan_credit_description' => 'Credit for unused time', + 'plan_pending_monthly' => 'Will switch to monthly on :date', + 'plan_refunded' => 'A refund has been issued.', + + 'live_preview' => 'Live Preview', + 'page_size' => 'Page Size', + 'live_preview_disabled' => 'Live preview has been disabled to support selected font', + 'invoice_number_padding' => 'Padding', + 'preview' => 'Preview', + 'list_vendors' => 'List Vendors', + 'add_users_not_supported' => 'Upgrade to the Enterprise plan to add additional users to your account.', + 'enterprise_plan_features' => 'The Enterprise plan adds support for multiple users and file attachments.', + 'return_to_app' => 'Return to app', + ); diff --git a/resources/lang/fr_CA/texts.php b/resources/lang/fr_CA/texts.php index c62227e45050..3661ad15b1c0 100644 --- a/resources/lang/fr_CA/texts.php +++ b/resources/lang/fr_CA/texts.php @@ -487,7 +487,7 @@ return array( 'invoice_history' => 'Historique des factures', 'quote_history' => 'Historique des soumissions', 'current_version' => 'Version courante', - 'select_versiony' => 'Choix de la verison', + 'select_version' => 'Choix de la verison', 'view_history' => 'Consulter l\'historique', 'edit_payment' => 'Éditer le paiement', @@ -1190,4 +1190,93 @@ return array( 'november' => 'November', 'december' => 'December', + // Documents + 'documents_header' => 'Documents:', + 'email_documents_header' => 'Documents:', + 'email_documents_example_1' => 'Widgets Receipt.pdf', + 'email_documents_example_2' => 'Final Deliverable.zip', + 'invoice_documents' => 'Documents', + 'expense_documents' => 'Attached Documents', + 'invoice_embed_documents' => 'Embed Documents', + 'invoice_embed_documents_help' => 'Include attached images in the invoice.', + 'document_email_attachment' => 'Attach Documents', + 'download_documents' => 'Download Documents (:size)', + 'documents_from_expenses' => 'From Expenses:', + 'dropzone' => array(// See http://www.dropzonejs.com/#config-dictDefaultMessage + 'DefaultMessage' => 'Drop files or click to upload', + 'FallbackMessage' => 'Your browser does not support drag\'n\'drop file uploads.', + 'FallbackText' => 'Please use the fallback form below to upload your files like in the olden days.', + 'FileTooBig' => 'File is too big ({{filesize}}MiB). Max filesize: {{maxFilesize}}MiB.', + 'InvalidFileType' => 'You can\'t upload files of this type.', + 'ResponseError' => 'Server responded with {{statusCode}} code.', + 'CancelUpload' => 'Cancel upload', + 'CancelUploadConfirmation' => 'Are you sure you want to cancel this upload?', + 'RemoveFile' => 'Remove file', + ), + 'documents' => 'Documents', + 'document_date' => 'Document Date', + 'document_size' => 'Size', + + 'enable_client_portal' => 'Client Portal', + 'enable_client_portal_help' => 'Show/hide the client portal.', + 'enable_client_portal_dashboard' => 'Dashboard', + 'enable_client_portal_dashboard_help' => 'Show/hide the dashboard page in the client portal.', + + // Plans + 'account_management' => 'Account Management', + 'plan_status' => 'Plan Status', + + 'plan_upgrade' => 'Upgrade', + 'plan_change' => 'Change Plan', + 'pending_change_to' => 'Changes To', + 'plan_changes_to' => ':plan on :date', + 'plan_term_changes_to' => ':plan (:term) on :date', + 'cancel_plan_change' => 'Cancel Change', + 'plan' => 'Plan', + 'expires' => 'Expires', + 'renews' => 'Renews', + 'plan_expired' => ':plan Plan Expired', + 'trial_expired' => ':plan Plan Trial Ended', + 'never' => 'Never', + 'plan_free' => 'Free', + 'plan_pro' => 'Pro', + 'plan_enterprise' => 'Enterprise', + 'plan_white_label' => 'Self Hosted (White labeled)', + 'plan_free_self_hosted' => 'Self Hosted (Free)', + 'plan_trial' => 'Trial', + 'plan_term' => 'Term', + 'plan_term_monthly' => 'Monthly', + 'plan_term_yearly' => 'Yearly', + 'plan_term_month' => 'Month', + 'plan_term_year' => 'Year', + 'plan_price_monthly' => '$:price/Month', + 'plan_price_yearly' => '$:price/Year', + 'updated_plan' => 'Updated plan settings', + 'plan_paid' => 'Term Started', + 'plan_started' => 'Plan Started', + 'plan_expires' => 'Plan Expires', + + 'white_label_button' => 'White Label', + + 'pro_plan_year_description' => 'One year enrollment in the Invoice Ninja Pro Plan.', + 'pro_plan_month_description' => 'One month enrollment in the Invoice Ninja Pro Plan.', + 'enterprise_plan_product' => 'Enterprise Plan', + 'enterprise_plan_year_description' => 'One year enrollment in the Invoice Ninja Enterprise Plan.', + 'enterprise_plan_month_description' => 'One month enrollment in the Invoice Ninja Enterprise Plan.', + 'plan_credit_product' => 'Credit', + 'plan_credit_description' => 'Credit for unused time', + 'plan_pending_monthly' => 'Will switch to monthly on :date', + 'plan_refunded' => 'A refund has been issued.', + + 'live_preview' => 'Live Preview', + 'page_size' => 'Page Size', + 'live_preview_disabled' => 'Live preview has been disabled to support selected font', + 'invoice_number_padding' => 'Padding', + 'preview' => 'Preview', + 'list_vendors' => 'List Vendors', + 'add_users_not_supported' => 'Upgrade to the Enterprise plan to add additional users to your account.', + 'enterprise_plan_features' => 'The Enterprise plan adds support for multiple users and file attachments.', + 'return_to_app' => 'Return to app', + + ); \ No newline at end of file diff --git a/resources/lang/it/texts.php b/resources/lang/it/texts.php index 0b2a843ccd2c..01edae395357 100644 --- a/resources/lang/it/texts.php +++ b/resources/lang/it/texts.php @@ -30,7 +30,7 @@ return array( 'invoice' => 'Fattura', 'client' => 'Cliente', 'invoice_date' => 'Data Fattura', - 'due_date' => 'Scadenza Fattura', + 'due_date' => 'Scadenza', 'invoice_number' => 'Numero Fattura', 'invoice_number_short' => 'Fattura #', /* Fattura N° */ 'po_number' => 'Numero d\'ordine d\'acquisto', @@ -45,8 +45,8 @@ return array( 'quantity' => 'Quantità', 'line_total' => 'Totale Riga', 'subtotal' => 'Subtotale', - 'paid_to_date' => 'Pagato in Data', - 'balance_due' => 'Saldo Dovuto', + 'paid_to_date' => 'Pagato a oggi', + 'balance_due' => 'Totale', 'invoice_design_id' => 'Stile', 'terms' => 'Condizioni', 'your_invoice' => 'Tua Fattura', @@ -67,7 +67,7 @@ return array( 'clone_invoice' => 'Duplica Fattura', 'archive_invoice' => 'Archivia Fattura', 'delete_invoice' => 'Elimina Fattura', - 'email_invoice' => 'Manda Fattura', /* Spedisci Fattura */ + 'email_invoice' => 'Invia Fattura', /* Spedisci Fattura */ 'enter_payment' => 'Inserisci Pagamento', 'tax_rates' => 'Aliquote Fiscali', /* ^^Unsure^^ */ 'rate' => 'Aliquota', /* ^^Unsure^^ */ @@ -104,12 +104,12 @@ return array( // recurring invoices 'recurring_invoices' => 'Fatture ricorrenti', 'recurring_help' => '
Invia automaticamente al cliente le stesse fatture settimanalmente, bimestralmente, mensilmente, trimestralmente o annualmente.
-Usa :MESE, :TRIMESRE o :ANNO per date dinamiche. Funziona anche con la matematica di base, ad esempio :MESE-1.
+Usa :MONTH, :QUARTER o :YEAR per date dinamiche. Funziona anche con la matematica di base, ad esempio :MONTH-1.
Esempi di variabili di fattura dinamiche:
-
-
- "Iscrizione palestra per il mese di :MESE" => "Iscrizione palestra per il mese di Luglio" -
- ":ANNO+1 iscrizione annuale" => "Anno d\'iscrizione 2015" -
- "Pagamento fermo a :TRIMESTRE+1" => "Pagamento fermo al 2° trimestre" +
- "Iscrizione palestra per il mese di :MONTH" => "Iscrizione palestra per il mese di Luglio" +
- ":YEAR+1 iscrizione annuale" => "Anno d\'iscrizione 2015" +
- "Pagamento fermo a :QUARTER+1" => "Pagamento fermo al 2° trimestre"
Note: use a Legacy API Key, not an API token.', - 'payment_type_credit_card' => 'Credit card', + 'payment_type_credit_card' => 'Carta di credito', 'payment_type_paypal' => 'PayPal', 'payment_type_bitcoin' => 'Bitcoin', 'knowledge_base' => 'Knowledge Base', 'partial' => 'Partial', - 'partial_remaining' => ':partial of :balance', + 'partial_remaining' => ':partial di :balance', 'more_fields' => 'More Fields', 'less_fields' => 'Less Fields', @@ -614,40 +614,40 @@ return array( 'export' => 'Export', 'documentation' => 'Documentation', 'zapier' => 'Zapier', - 'recurring' => 'Recurring', - 'last_invoice_sent' => 'Last invoice sent :date', + 'recurring' => 'Ricorrenti', + 'last_invoice_sent' => 'Ultima fattura inviata :date', 'processed_updates' => 'Successfully completed update', - 'tasks' => 'Tasks', - 'new_task' => 'New Task', - 'start_time' => 'Start Time', + 'tasks' => 'Task', + 'new_task' => 'Nuovo Task', + 'start_time' => 'Tempo di inizio', 'created_task' => 'Successfully created task', 'updated_task' => 'Successfully updated task', - 'edit_task' => 'Edit Task', - 'archive_task' => 'Archive Task', - 'restore_task' => 'Restore Task', - 'delete_task' => 'Delete Task', - 'stop_task' => 'Stop Task', - 'time' => 'Time', - 'start' => 'Start', - 'stop' => 'Stop', - 'now' => 'Now', + 'edit_task' => 'Modifica il Task', + 'archive_task' => 'Archivia il Task', + 'restore_task' => 'Ripristina il Task', + 'delete_task' => 'Cancella il Task', + 'stop_task' => 'Ferma il Task', + 'time' => 'Tempo', + 'start' => 'Inizia', + 'stop' => 'Ferma', + 'now' => 'Adesso', 'timer' => 'Timer', - 'manual' => 'Manual', - 'date_and_time' => 'Date & Time', - 'second' => 'second', - 'seconds' => 'seconds', - 'minute' => 'minute', - 'minutes' => 'minutes', - 'hour' => 'hour', - 'hours' => 'hours', - 'task_details' => 'Task Details', - 'duration' => 'Duration', - 'end_time' => 'End Time', - 'end' => 'End', - 'invoiced' => 'Invoiced', - 'logged' => 'Logged', - 'running' => 'Running', + 'manual' => 'Manuale', + 'date_and_time' => 'Data e ora', + 'second' => 'secondo', + 'seconds' => 'secondi', + 'minute' => 'minuto', + 'minutes' => 'minuti', + 'hour' => 'ora', + 'hours' => 'ore', + 'task_details' => 'Dettagli Task', + 'duration' => 'Durata', + 'end_time' => 'Tempo di fine', + 'end' => 'Fine', + 'invoiced' => 'Fatturato', + 'logged' => 'Loggato', + 'running' => 'In corso', 'task_error_multiple_clients' => 'The tasks can\'t belong to different clients', 'task_error_running' => 'Please stop running tasks first', 'task_error_invoiced' => 'Tasks have already been invoiced', @@ -656,9 +656,9 @@ return array( 'archived_tasks' => 'Successfully archived :count tasks', 'deleted_task' => 'Successfully deleted task', 'deleted_tasks' => 'Successfully deleted :count tasks', - 'create_task' => 'Create Task', + 'create_task' => 'Crea Task', 'stopped_task' => 'Successfully stopped task', - 'invoice_task' => 'Invoice Task', + 'invoice_task' => 'Fattura il Task', 'invoice_labels' => 'Invoice Labels', 'prefix' => 'Prefix', 'counter' => 'Counter', @@ -666,7 +666,7 @@ return array( 'payment_type_dwolla' => 'Dwolla', 'gateway_help_43' => ':link to sign up for Dwolla.', 'partial_value' => 'Must be greater than zero and less than the total', - 'more_actions' => 'More Actions', + 'more_actions' => 'Altre Azioni', 'pro_plan_title' => 'NINJA PRO', @@ -680,12 +680,12 @@ return array( 'pro_plan_feature7' => 'Customize Invoice Field Titles & Numbering', 'pro_plan_feature8' => 'Option to Attach PDFs to Client Emails', - 'resume' => 'Resume', - 'break_duration' => 'Break', - 'edit_details' => 'Edit Details', + 'resume' => 'Riprendi', + 'break_duration' => 'Interrompi', + 'edit_details' => 'Modifica dettagli', 'work' => 'Work', 'timezone_unset' => 'Please :link to set your timezone', - 'click_here' => 'click here', + 'click_here' => 'clicca qui', 'email_receipt' => 'Email payment receipt to the client', 'created_payment_emailed_client' => 'Successfully created payment and emailed client', @@ -728,16 +728,16 @@ return array( 'header' => 'Header', 'footer' => 'Footer', 'custom' => 'Custom', - 'invoice_to' => 'Invoice to', - 'invoice_no' => 'Invoice No.', - 'recent_payments' => 'Recent Payments', - 'outstanding' => 'Outstanding', - 'manage_companies' => 'Manage Companies', - 'total_revenue' => 'Total Revenue', + 'invoice_to' => 'Fattura a', + 'invoice_no' => 'Fattura N.', + 'recent_payments' => 'Pagamenti recenti', + 'outstanding' => 'Inevaso', + 'manage_companies' => 'Gestisci aziende', + 'total_revenue' => 'Ricavo totale', 'current_user' => 'Current User', - 'new_recurring_invoice' => 'New Recurring Invoice', - 'recurring_invoice' => 'Recurring Invoice', + 'new_recurring_invoice' => 'Nuova Fattura Ricorrente', + 'recurring_invoice' => 'Fattura ricorrente', 'recurring_too_soon' => 'It\'s too soon to create the next recurring invoice, it\'s scheduled for :date', 'created_by_invoice' => 'Created by :invoice', 'primary_user' => 'Primary User', @@ -746,17 +746,17 @@ return array(
To access a child property using dot notation. For example to show the client name you could use $client.name.
If you need help figuring something out post a question to our support forum.
', - 'invoice_due_date' => 'Due Date', - 'quote_due_date' => 'Valid Until', - 'valid_until' => 'Valid Until', + 'invoice_due_date' => 'Scadenza fattura', + 'quote_due_date' => 'Validità preventivo', + 'valid_until' => 'Valido fino a', 'reset_terms' => 'Reset terms', 'reset_footer' => 'Reset footer', 'invoices_sent' => ':count invoice sent|:count invoices sent', - 'status_draft' => 'Draft', - 'status_sent' => 'Sent', - 'status_viewed' => 'Viewed', - 'status_partial' => 'Partial', - 'status_paid' => 'Paid', + 'status_draft' => 'Bozza', + 'status_sent' => 'Spedito', + 'status_viewed' => 'Visto', + 'status_partial' => 'Parziale', + 'status_paid' => 'Pagato', 'show_line_item_tax' => 'Display line item taxes inline', 'iframe_url' => 'Website', @@ -784,16 +784,16 @@ return array( 'last_sent_on' => 'Last sent on :date', 'page_expire' => 'This page will expire soon, :click_here to keep working', - 'upcoming_quotes' => 'Upcoming Quotes', - 'expired_quotes' => 'Expired Quotes', + 'upcoming_quotes' => 'Preventivi in scadenza', + 'expired_quotes' => 'Preventivi Scaduti', 'sign_up_using' => 'Sign up using', - 'invalid_credentials' => 'These credentials do not match our records', - 'show_all_options' => 'Show all options', - 'user_details' => 'User Details', + 'invalid_credentials' => 'Queste credenziali non corrispondono alle nostre registrazioni', + 'show_all_options' => 'Mostra tutte le opzioni', + 'user_details' => 'Dettagli Utente', 'oneclick_login' => 'One-Click Login', - 'disable' => 'Disable', - 'invoice_quote_number' => 'Invoice and Quote Numbers', + 'disable' => 'Disabilita', + 'invoice_quote_number' => 'Numerazione Fatture e Preventivi', 'invoice_charges' => 'Invoice Charges', 'invitation_status' => [ @@ -807,10 +807,10 @@ return array( 'notification_quote_bounced_subject' => 'Unable to deliver Quote :invoice', 'custom_invoice_link' => 'Custom Invoice Link', - 'total_invoiced' => 'Total Invoiced', - 'open_balance' => 'Open Balance', + 'total_invoiced' => 'Fatturato totale', + 'open_balance' => 'Da saldare', 'verify_email' => 'Please visit the link in the account confirmation email to verify your email address.', - 'basic_settings' => 'Basic Settings', + 'basic_settings' => 'Impostazioni Base', 'pro' => 'Pro', 'gateways' => 'Payment Gateways', @@ -821,7 +821,7 @@ return array( 'oneclick_login_help' => 'Connect an account to login without a password', 'referral_code_help' => 'Earn money by sharing our app online', - 'enable_with_stripe' => 'Enable | Requires Stripe', + 'enable_with_stripe' => 'Abilita | Richiede Stripe', 'tax_settings' => 'Tax Settings', 'create_tax_rate' => 'Add Tax Rate', 'updated_tax_rate' => 'Successfully updated tax rate', @@ -842,19 +842,19 @@ return array( 'quote_counter' => 'Quote Counter', 'type' => 'Type', - 'activity_1' => ':user created client :client', - 'activity_2' => ':user archived client :client', + 'activity_1' => ':user ha creato il cliente :client', + 'activity_2' => ':user ha archiviato il cliente :client', 'activity_3' => ':user deleted client :client', - 'activity_4' => ':user created invoice :invoice', - 'activity_5' => ':user updated invoice :invoice', - 'activity_6' => ':user emailed invoice :invoice to :contact', - 'activity_7' => ':contact viewed invoice :invoice', - 'activity_8' => ':user archived invoice :invoice', - 'activity_9' => ':user deleted invoice :invoice', - 'activity_10' => ':contact entered payment :payment for :invoice', - 'activity_11' => ':user updated payment :payment', - 'activity_12' => ':user archived payment :payment', - 'activity_13' => ':user deleted payment :payment', + 'activity_4' => ':user ha creato la fattura :invoice', + 'activity_5' => ':user ha aggiornato la fattura :invoice', + 'activity_6' => ':user ha inviato per email la fattura :invoice a :contact', + 'activity_7' => ':contact ha visto la fattura :invoice', + 'activity_8' => ':user ha archiviato la fattura :invoice', + 'activity_9' => ':user ha cancellato la fattura :invoice', + 'activity_10' => ':contact ha inserito il pagamento :payment per :invoice', + 'activity_11' => ':user ha aggiornato il pagamento :payment', + 'activity_12' => ':user ha archiviato il pagamento :payment', + 'activity_13' => ':user ha cancellato il pagamento :payment', 'activity_14' => ':user entered :credit credit', 'activity_15' => ':user updated :credit credit', 'activity_16' => ':user archived :credit credit', @@ -862,7 +862,7 @@ return array( 'activity_18' => ':user created quote :quote', 'activity_19' => ':user updated quote :quote', 'activity_20' => ':user emailed quote :quote to :contact', - 'activity_21' => ':contact viewed quote :quote', + 'activity_21' => ':contact ha visto il preventivo :quote', 'activity_22' => ':user archived quote :quote', 'activity_23' => ':user deleted quote :quote', 'activity_24' => ':user restored quote :quote', @@ -870,7 +870,7 @@ return array( 'activity_26' => ':user restored client :client', 'activity_27' => ':user restored payment :payment', 'activity_28' => ':user restored :credit credit', - 'activity_29' => ':contact approved quote :quote', + 'activity_29' => ':contact ha approvato la fattura :quote', 'payment' => 'Payment', 'system' => 'System', @@ -883,7 +883,7 @@ return array( 'quote_footer' => 'Quote Footer', 'free' => 'Free', - 'quote_is_approved' => 'This quote is approved', + 'quote_is_approved' => 'Questo preventivo è stato approvato.', 'apply_credit' => 'Apply Credit', 'system_settings' => 'System Settings', 'archive_token' => 'Archive Token', @@ -944,7 +944,7 @@ return array( 'missing_publishable_key' => 'Set your Stripe publishable key for an improved checkout process', 'email_design' => 'Email Design', - 'due_by' => 'Due by :date', + 'due_by' => 'Scadenza :date', 'enable_email_markup' => 'Enable 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', @@ -986,10 +986,10 @@ return array( 'white_label_purchase_link' => 'Purchase a white label license', // Expense / vendor - 'expense' => 'Expense', - 'expenses' => 'Expenses', - 'new_expense' => 'Enter Expense', - 'enter_expense' => 'Enter Expense', + 'expense' => 'Spesa', + 'expenses' => 'Spese', + 'new_expense' => 'Inserisci Spesa', + 'enter_expense' => 'Inserisci Spesa', 'vendors' => 'Vendors', 'new_vendor' => 'New Vendor', 'payment_terms_net' => 'Net', @@ -1004,33 +1004,33 @@ return array( 'archived_expenses' => 'Successfully archived expenses', // Expenses - 'expense_amount' => 'Expense Amount', - 'expense_balance' => 'Expense Balance', - 'expense_date' => 'Expense Date', - 'expense_should_be_invoiced' => 'Should this expense be invoiced?', - 'public_notes' => 'Public Notes', - 'invoice_amount' => 'Invoice Amount', - 'exchange_rate' => 'Exchange Rate', - 'yes' => 'Yes', + 'expense_amount' => 'Importo Spesa', + 'expense_balance' => 'Bilancio Spesa', + 'expense_date' => 'Data Spesa', + 'expense_should_be_invoiced' => 'Questa spesa deve essere fatturata?', + 'public_notes' => 'Note Pubbliche (Descrizione in fattura)', + 'invoice_amount' => 'Importo Fattura', + 'exchange_rate' => 'Tasso di Cambio', + 'yes' => 'Si', 'no' => 'No', - 'should_be_invoiced' => 'Should be invoiced', - 'view_expense' => 'View expense # :expense', - 'edit_expense' => 'Edit Expense', - 'archive_expense' => 'Archive Expense', - 'delete_expense' => 'Delete Expense', - 'view_expense_num' => 'Expense # :expense', - 'updated_expense' => 'Successfully updated expense', - 'created_expense' => 'Successfully created expense', - 'enter_expense' => 'Enter Expense', - 'view' => 'View', - 'restore_expense' => 'Restore Expense', - 'invoice_expense' => 'Invoice Expense', - 'expense_error_multiple_clients' =>'The expenses can\'t belong to different clients', - 'expense_error_invoiced' => 'Expense has already been invoiced', - 'convert_currency' => 'Convert currency', + 'should_be_invoiced' => 'Deve essere fatturata', + 'view_expense' => 'Vedi spesa # :expense', + 'edit_expense' => 'Modifica Spesa', + 'archive_expense' => 'Archivia Spesa', + 'delete_expense' => 'Cancella Spesa', + 'view_expense_num' => 'Spesa # :expense', + 'updated_expense' => 'Spesa aggiornata con successo', + 'created_expense' => 'Spesa creata con successo', + 'enter_expense' => 'Inserisci Spesa', + 'view' => 'Vedi', + 'restore_expense' => 'Ripristina Spesa', + 'invoice_expense' => 'Fattura Spesa', + 'expense_error_multiple_clients' =>'Le spese non possono appartenere a clienti differenti', + 'expense_error_invoiced' => 'La spesa è stata già fatturata', + 'convert_currency' => 'Converti valuta', // Payment terms - 'num_days' => 'Number of days', + 'num_days' => 'Numero di giorni', 'create_payment_term' => 'Create Payment Term', 'edit_payment_terms' => 'Edit Payment Term', 'edit_payment_term' => 'Edit Payment Term', @@ -1053,17 +1053,17 @@ return array( ', 'due' => 'Due', 'next_due_on' => 'Due Next: :date', - 'use_client_terms' => 'Use client terms', - 'day_of_month' => ':ordinal day of month', - 'last_day_of_month' => 'Last day of month', - 'day_of_week_after' => ':ordinal :day after', - 'sunday' => 'Sunday', - 'monday' => 'Monday', - 'tuesday' => 'Tuesday', - 'wednesday' => 'Wednesday', - 'thursday' => 'Thursday', - 'friday' => 'Friday', - 'saturday' => 'Saturday', + 'use_client_terms' => 'Usa i termini del cliente', + 'day_of_month' => ':ordinal giorno del mese', + 'last_day_of_month' => 'L\'ultimo giorno del mese', + 'day_of_week_after' => ':ordinal :day dopo', + 'sunday' => 'Domenica', + 'monday' => 'Lunedì', + 'tuesday' => 'Martedì', + 'wednesday' => 'Mercoledì', + 'thursday' => 'Giovedì', + 'friday' => 'Venerdì', + 'saturday' => 'Sabato', // Fonts 'header_font_id' => 'Header Font', @@ -1077,11 +1077,11 @@ return array( 'quote_message_button' => 'To view your quote for :amount, click the button below.', 'payment_message_button' => 'Thank you for your payment of :amount.', 'payment_type_direct_debit' => 'Direct Debit', - 'bank_accounts' => 'Bank Accounts', - 'add_bank_account' => 'Add Bank Account', + 'bank_accounts' => 'Conti corrente', + 'add_bank_account' => 'Nuovo conto corrente', 'setup_account' => 'Setup Account', - 'import_expenses' => 'Import Expenses', - 'bank_id' => 'bank', + 'import_expenses' => 'Importa Spese', + 'bank_id' => 'banca', 'integration_type' => 'Integration Type', 'updated_bank_account' => 'Successfully updated bank account', 'edit_bank_account' => 'Edit Bank Account', @@ -1172,7 +1172,7 @@ return array( 'user_edit_all' => 'Edit all clients, invoices, etc.', 'gateway_help_20' => ':link to sign up for Sage Pay.', 'gateway_help_21' => ':link to sign up for Sage Pay.', - 'partial_due' => 'Partial Due', + 'partial_due' => 'Da versare (parziale)', 'restore_vendor' => 'Restore Vendor', 'restored_vendor' => 'Successfully restored vendor', 'restored_expense' => 'Successfully restored expense', @@ -1182,17 +1182,105 @@ return array( 'edit_all_help' => 'Allow user to modify records they didn\'t create', 'view_payment' => 'View Payment', - 'january' => 'January', - 'february' => 'February', - 'march' => 'March', - 'april' => 'April', - 'may' => 'May', - 'june' => 'June', - 'july' => 'July', - 'august' => 'August', - 'september' => 'September', - 'october' => 'October', - 'november' => 'November', - 'december' => 'December', + 'january' => 'Gennaio', + 'february' => 'Febbraio', + 'march' => 'Marzo', + 'april' => 'Aprile', + 'may' => 'Maggio', + 'june' => 'Giugno', + 'july' => 'Luglio', + 'august' => 'Agosto', + 'september' => 'Settembre', + 'october' => 'Ottobre', + 'november' => 'Novembre', + 'december' => 'Dicembre', -); \ No newline at end of file + // Documents + 'documents_header' => 'Documents:', + 'email_documents_header' => 'Documents:', + 'email_documents_example_1' => 'Widgets Receipt.pdf', + 'email_documents_example_2' => 'Final Deliverable.zip', + 'invoice_documents' => 'Documents', + 'expense_documents' => 'Attached Documents', + 'invoice_embed_documents' => 'Embed Documents', + 'invoice_embed_documents_help' => 'Include attached images in the invoice.', + 'document_email_attachment' => 'Attach Documents', + 'download_documents' => 'Download Documents (:size)', + 'documents_from_expenses' => 'From Expenses:', + 'dropzone' => array(// See http://www.dropzonejs.com/#config-dictDefaultMessage + 'DefaultMessage' => 'Drop files or click to upload', + 'FallbackMessage' => 'Your browser does not support drag\'n\'drop file uploads.', + 'FallbackText' => 'Please use the fallback form below to upload your files like in the olden days.', + 'FileTooBig' => 'File is too big ({{filesize}}MiB). Max filesize: {{maxFilesize}}MiB.', + 'InvalidFileType' => 'You can\'t upload files of this type.', + 'ResponseError' => 'Server responded with {{statusCode}} code.', + 'CancelUpload' => 'Cancel upload', + 'CancelUploadConfirmation' => 'Are you sure you want to cancel this upload?', + 'RemoveFile' => 'Remove file', + ), + 'documents' => 'Documents', + 'document_date' => 'Document Date', + 'document_size' => 'Size', + + 'enable_client_portal' => 'Client Portal', + 'enable_client_portal_help' => 'Show/hide the client portal.', + 'enable_client_portal_dashboard' => 'Dashboard', + 'enable_client_portal_dashboard_help' => 'Show/hide the dashboard page in the client portal.', + + // Plans + 'account_management' => 'Account Management', + 'plan_status' => 'Plan Status', + + 'plan_upgrade' => 'Upgrade', + 'plan_change' => 'Change Plan', + 'pending_change_to' => 'Changes To', + 'plan_changes_to' => ':plan on :date', + 'plan_term_changes_to' => ':plan (:term) on :date', + 'cancel_plan_change' => 'Cancel Change', + 'plan' => 'Plan', + 'expires' => 'Expires', + 'renews' => 'Renews', + 'plan_expired' => ':plan Plan Expired', + 'trial_expired' => ':plan Plan Trial Ended', + 'never' => 'Never', + 'plan_free' => 'Free', + 'plan_pro' => 'Pro', + 'plan_enterprise' => 'Enterprise', + 'plan_white_label' => 'Self Hosted (White labeled)', + 'plan_free_self_hosted' => 'Self Hosted (Free)', + 'plan_trial' => 'Trial', + 'plan_term' => 'Term', + 'plan_term_monthly' => 'Monthly', + 'plan_term_yearly' => 'Yearly', + 'plan_term_month' => 'Month', + 'plan_term_year' => 'Year', + 'plan_price_monthly' => '$:price/Month', + 'plan_price_yearly' => '$:price/Year', + 'updated_plan' => 'Updated plan settings', + 'plan_paid' => 'Term Started', + 'plan_started' => 'Plan Started', + 'plan_expires' => 'Plan Expires', + + 'white_label_button' => 'White Label', + + 'pro_plan_year_description' => 'One year enrollment in the Invoice Ninja Pro Plan.', + 'pro_plan_month_description' => 'One month enrollment in the Invoice Ninja Pro Plan.', + 'enterprise_plan_product' => 'Enterprise Plan', + 'enterprise_plan_year_description' => 'One year enrollment in the Invoice Ninja Enterprise Plan.', + 'enterprise_plan_month_description' => 'One month enrollment in the Invoice Ninja Enterprise Plan.', + 'plan_credit_product' => 'Credit', + 'plan_credit_description' => 'Credit for unused time', + 'plan_pending_monthly' => 'Will switch to monthly on :date', + 'plan_refunded' => 'A refund has been issued.', + + 'live_preview' => 'Live Preview', + 'page_size' => 'Page Size', + 'live_preview_disabled' => 'Live preview has been disabled to support selected font', + 'invoice_number_padding' => 'Padding', + 'preview' => 'Preview', + 'list_vendors' => 'List Vendors', + 'add_users_not_supported' => 'Upgrade to the Enterprise plan to add additional users to your account.', + 'enterprise_plan_features' => 'The Enterprise plan adds support for multiple users and file attachments.', + 'return_to_app' => 'Return to app', + +); diff --git a/resources/lang/ja/texts.php b/resources/lang/ja/texts.php index 7e673ac11d33..3875de243544 100644 --- a/resources/lang/ja/texts.php +++ b/resources/lang/ja/texts.php @@ -424,7 +424,7 @@ $LANG = array( 'invoice_history' => '請求履歴', 'quote_history' => '見積履歴', 'current_version' => '現在のバージョン', - 'select_versiony' => 'バージョンを選択', + 'select_version' => 'バージョンを選択', 'view_history' => '履歴を閲覧', 'edit_payment' => '支払いを編集', 'updated_payment' => '支払いを更新しました', @@ -1096,6 +1096,95 @@ $LANG = array( 'october' => 'October', 'november' => 'November', 'december' => 'December', + + // Documents + 'documents_header' => 'Documents:', + 'email_documents_header' => 'Documents:', + 'email_documents_example_1' => 'Widgets Receipt.pdf', + 'email_documents_example_2' => 'Final Deliverable.zip', + 'invoice_documents' => 'Documents', + 'expense_documents' => 'Attached Documents', + 'invoice_embed_documents' => 'Embed Documents', + 'invoice_embed_documents_help' => 'Include attached images in the invoice.', + 'document_email_attachment' => 'Attach Documents', + 'download_documents' => 'Download Documents (:size)', + 'documents_from_expenses' => 'From Expenses:', + 'dropzone' => array(// See http://www.dropzonejs.com/#config-dictDefaultMessage + 'DefaultMessage' => 'Drop files or click to upload', + 'FallbackMessage' => 'Your browser does not support drag\'n\'drop file uploads.', + 'FallbackText' => 'Please use the fallback form below to upload your files like in the olden days.', + 'FileTooBig' => 'File is too big ({{filesize}}MiB). Max filesize: {{maxFilesize}}MiB.', + 'InvalidFileType' => 'You can\'t upload files of this type.', + 'ResponseError' => 'Server responded with {{statusCode}} code.', + 'CancelUpload' => 'Cancel upload', + 'CancelUploadConfirmation' => 'Are you sure you want to cancel this upload?', + 'RemoveFile' => 'Remove file', + ), + 'documents' => 'Documents', + 'document_date' => 'Document Date', + 'document_size' => 'Size', + + 'enable_client_portal' => 'Client Portal', + 'enable_client_portal_help' => 'Show/hide the client portal.', + 'enable_client_portal_dashboard' => 'Dashboard', + 'enable_client_portal_dashboard_help' => 'Show/hide the dashboard page in the client portal.', + + // Plans + 'account_management' => 'Account Management', + 'plan_status' => 'Plan Status', + + 'plan_upgrade' => 'Upgrade', + 'plan_change' => 'Change Plan', + 'pending_change_to' => 'Changes To', + 'plan_changes_to' => ':plan on :date', + 'plan_term_changes_to' => ':plan (:term) on :date', + 'cancel_plan_change' => 'Cancel Change', + 'plan' => 'Plan', + 'expires' => 'Expires', + 'renews' => 'Renews', + 'plan_expired' => ':plan Plan Expired', + 'trial_expired' => ':plan Plan Trial Ended', + 'never' => 'Never', + 'plan_free' => 'Free', + 'plan_pro' => 'Pro', + 'plan_enterprise' => 'Enterprise', + 'plan_white_label' => 'Self Hosted (White labeled)', + 'plan_free_self_hosted' => 'Self Hosted (Free)', + 'plan_trial' => 'Trial', + 'plan_term' => 'Term', + 'plan_term_monthly' => 'Monthly', + 'plan_term_yearly' => 'Yearly', + 'plan_term_month' => 'Month', + 'plan_term_year' => 'Year', + 'plan_price_monthly' => '$:price/Month', + 'plan_price_yearly' => '$:price/Year', + 'updated_plan' => 'Updated plan settings', + 'plan_paid' => 'Term Started', + 'plan_started' => 'Plan Started', + 'plan_expires' => 'Plan Expires', + + 'white_label_button' => 'White Label', + + 'pro_plan_year_description' => 'One year enrollment in the Invoice Ninja Pro Plan.', + 'pro_plan_month_description' => 'One month enrollment in the Invoice Ninja Pro Plan.', + 'enterprise_plan_product' => 'Enterprise Plan', + 'enterprise_plan_year_description' => 'One year enrollment in the Invoice Ninja Enterprise Plan.', + 'enterprise_plan_month_description' => 'One month enrollment in the Invoice Ninja Enterprise Plan.', + 'plan_credit_product' => 'Credit', + 'plan_credit_description' => 'Credit for unused time', + 'plan_pending_monthly' => 'Will switch to monthly on :date', + 'plan_refunded' => 'A refund has been issued.', + + 'live_preview' => 'Live Preview', + 'page_size' => 'Page Size', + 'live_preview_disabled' => 'Live preview has been disabled to support selected font', + 'invoice_number_padding' => 'Padding', + 'preview' => 'Preview', + 'list_vendors' => 'List Vendors', + 'add_users_not_supported' => 'Upgrade to the Enterprise plan to add additional users to your account.', + 'enterprise_plan_features' => 'The Enterprise plan adds support for multiple users and file attachments.', + 'return_to_app' => 'Return to app', + ); diff --git a/resources/lang/lt/texts.php b/resources/lang/lt/texts.php index 252a7f03bd9c..75cb494ca986 100644 --- a/resources/lang/lt/texts.php +++ b/resources/lang/lt/texts.php @@ -497,7 +497,7 @@ return array( 'invoice_history' => 'Invoice History', 'quote_history' => 'Quote History', 'current_version' => 'Current version', - 'select_versiony' => 'Select version', + 'select_version' => 'Select version', 'view_history' => 'View History', 'edit_payment' => 'Edit Payment', @@ -1202,4 +1202,92 @@ return array( 'november' => 'November', 'december' => 'December', + // Documents + 'documents_header' => 'Documents:', + 'email_documents_header' => 'Documents:', + 'email_documents_example_1' => 'Widgets Receipt.pdf', + 'email_documents_example_2' => 'Final Deliverable.zip', + 'invoice_documents' => 'Documents', + 'expense_documents' => 'Attached Documents', + 'invoice_embed_documents' => 'Embed Documents', + 'invoice_embed_documents_help' => 'Include attached images in the invoice.', + 'document_email_attachment' => 'Attach Documents', + 'download_documents' => 'Download Documents (:size)', + 'documents_from_expenses' => 'From Expenses:', + 'dropzone' => array(// See http://www.dropzonejs.com/#config-dictDefaultMessage + 'DefaultMessage' => 'Drop files or click to upload', + 'FallbackMessage' => 'Your browser does not support drag\'n\'drop file uploads.', + 'FallbackText' => 'Please use the fallback form below to upload your files like in the olden days.', + 'FileTooBig' => 'File is too big ({{filesize}}MiB). Max filesize: {{maxFilesize}}MiB.', + 'InvalidFileType' => 'You can\'t upload files of this type.', + 'ResponseError' => 'Server responded with {{statusCode}} code.', + 'CancelUpload' => 'Cancel upload', + 'CancelUploadConfirmation' => 'Are you sure you want to cancel this upload?', + 'RemoveFile' => 'Remove file', + ), + 'documents' => 'Documents', + 'document_date' => 'Document Date', + 'document_size' => 'Size', + + 'enable_client_portal' => 'Client Portal', + 'enable_client_portal_help' => 'Show/hide the client portal.', + 'enable_client_portal_dashboard' => 'Dashboard', + 'enable_client_portal_dashboard_help' => 'Show/hide the dashboard page in the client portal.', + + // Plans + 'account_management' => 'Account Management', + 'plan_status' => 'Plan Status', + + 'plan_upgrade' => 'Upgrade', + 'plan_change' => 'Change Plan', + 'pending_change_to' => 'Changes To', + 'plan_changes_to' => ':plan on :date', + 'plan_term_changes_to' => ':plan (:term) on :date', + 'cancel_plan_change' => 'Cancel Change', + 'plan' => 'Plan', + 'expires' => 'Expires', + 'renews' => 'Renews', + 'plan_expired' => ':plan Plan Expired', + 'trial_expired' => ':plan Plan Trial Ended', + 'never' => 'Never', + 'plan_free' => 'Free', + 'plan_pro' => 'Pro', + 'plan_enterprise' => 'Enterprise', + 'plan_white_label' => 'Self Hosted (White labeled)', + 'plan_free_self_hosted' => 'Self Hosted (Free)', + 'plan_trial' => 'Trial', + 'plan_term' => 'Term', + 'plan_term_monthly' => 'Monthly', + 'plan_term_yearly' => 'Yearly', + 'plan_term_month' => 'Month', + 'plan_term_year' => 'Year', + 'plan_price_monthly' => '$:price/Month', + 'plan_price_yearly' => '$:price/Year', + 'updated_plan' => 'Updated plan settings', + 'plan_paid' => 'Term Started', + 'plan_started' => 'Plan Started', + 'plan_expires' => 'Plan Expires', + + 'white_label_button' => 'White Label', + + 'pro_plan_year_description' => 'One year enrollment in the Invoice Ninja Pro Plan.', + 'pro_plan_month_description' => 'One month enrollment in the Invoice Ninja Pro Plan.', + 'enterprise_plan_product' => 'Enterprise Plan', + 'enterprise_plan_year_description' => 'One year enrollment in the Invoice Ninja Enterprise Plan.', + 'enterprise_plan_month_description' => 'One month enrollment in the Invoice Ninja Enterprise Plan.', + 'plan_credit_product' => 'Credit', + 'plan_credit_description' => 'Credit for unused time', + 'plan_pending_monthly' => 'Will switch to monthly on :date', + 'plan_refunded' => 'A refund has been issued.', + + 'live_preview' => 'Live Preview', + 'page_size' => 'Page Size', + 'live_preview_disabled' => 'Live preview has been disabled to support selected font', + 'invoice_number_padding' => 'Padding', + 'preview' => 'Preview', + 'list_vendors' => 'List Vendors', + 'add_users_not_supported' => 'Upgrade to the Enterprise plan to add additional users to your account.', + 'enterprise_plan_features' => 'The Enterprise plan adds support for multiple users and file attachments.', + 'return_to_app' => 'Return to app', + ); \ No newline at end of file diff --git a/resources/lang/nb_NO/texts.php b/resources/lang/nb_NO/texts.php index df06d7a32547..a06e7c60d679 100644 --- a/resources/lang/nb_NO/texts.php +++ b/resources/lang/nb_NO/texts.php @@ -493,7 +493,7 @@ return array( 'invoice_history' => 'Faktura Historikk', 'quote_history' => 'Tilbuds Historikk', 'current_version' => 'Nåværende versjon', - 'select_versiony' => 'Velg versjon', + 'select_version' => 'Velg versjon', 'view_history' => 'Vis Historikk', 'edit_payment' => 'Rediger Betaling', @@ -1200,4 +1200,92 @@ return array( 'november' => 'November', 'december' => 'December', + // Documents + 'documents_header' => 'Documents:', + 'email_documents_header' => 'Documents:', + 'email_documents_example_1' => 'Widgets Receipt.pdf', + 'email_documents_example_2' => 'Final Deliverable.zip', + 'invoice_documents' => 'Documents', + 'expense_documents' => 'Attached Documents', + 'invoice_embed_documents' => 'Embed Documents', + 'invoice_embed_documents_help' => 'Include attached images in the invoice.', + 'document_email_attachment' => 'Attach Documents', + 'download_documents' => 'Download Documents (:size)', + 'documents_from_expenses' => 'From Expenses:', + 'dropzone' => array(// See http://www.dropzonejs.com/#config-dictDefaultMessage + 'DefaultMessage' => 'Drop files or click to upload', + 'FallbackMessage' => 'Your browser does not support drag\'n\'drop file uploads.', + 'FallbackText' => 'Please use the fallback form below to upload your files like in the olden days.', + 'FileTooBig' => 'File is too big ({{filesize}}MiB). Max filesize: {{maxFilesize}}MiB.', + 'InvalidFileType' => 'You can\'t upload files of this type.', + 'ResponseError' => 'Server responded with {{statusCode}} code.', + 'CancelUpload' => 'Cancel upload', + 'CancelUploadConfirmation' => 'Are you sure you want to cancel this upload?', + 'RemoveFile' => 'Remove file', + ), + 'documents' => 'Documents', + 'document_date' => 'Document Date', + 'document_size' => 'Size', + + 'enable_client_portal' => 'Client Portal', + 'enable_client_portal_help' => 'Show/hide the client portal.', + 'enable_client_portal_dashboard' => 'Dashboard', + 'enable_client_portal_dashboard_help' => 'Show/hide the dashboard page in the client portal.', + + // Plans + 'account_management' => 'Account Management', + 'plan_status' => 'Plan Status', + + 'plan_upgrade' => 'Upgrade', + 'plan_change' => 'Change Plan', + 'pending_change_to' => 'Changes To', + 'plan_changes_to' => ':plan on :date', + 'plan_term_changes_to' => ':plan (:term) on :date', + 'cancel_plan_change' => 'Cancel Change', + 'plan' => 'Plan', + 'expires' => 'Expires', + 'renews' => 'Renews', + 'plan_expired' => ':plan Plan Expired', + 'trial_expired' => ':plan Plan Trial Ended', + 'never' => 'Never', + 'plan_free' => 'Free', + 'plan_pro' => 'Pro', + 'plan_enterprise' => 'Enterprise', + 'plan_white_label' => 'Self Hosted (White labeled)', + 'plan_free_self_hosted' => 'Self Hosted (Free)', + 'plan_trial' => 'Trial', + 'plan_term' => 'Term', + 'plan_term_monthly' => 'Monthly', + 'plan_term_yearly' => 'Yearly', + 'plan_term_month' => 'Month', + 'plan_term_year' => 'Year', + 'plan_price_monthly' => '$:price/Month', + 'plan_price_yearly' => '$:price/Year', + 'updated_plan' => 'Updated plan settings', + 'plan_paid' => 'Term Started', + 'plan_started' => 'Plan Started', + 'plan_expires' => 'Plan Expires', + + 'white_label_button' => 'White Label', + + 'pro_plan_year_description' => 'One year enrollment in the Invoice Ninja Pro Plan.', + 'pro_plan_month_description' => 'One month enrollment in the Invoice Ninja Pro Plan.', + 'enterprise_plan_product' => 'Enterprise Plan', + 'enterprise_plan_year_description' => 'One year enrollment in the Invoice Ninja Enterprise Plan.', + 'enterprise_plan_month_description' => 'One month enrollment in the Invoice Ninja Enterprise Plan.', + 'plan_credit_product' => 'Credit', + 'plan_credit_description' => 'Credit for unused time', + 'plan_pending_monthly' => 'Will switch to monthly on :date', + 'plan_refunded' => 'A refund has been issued.', + + 'live_preview' => 'Live Preview', + 'page_size' => 'Page Size', + 'live_preview_disabled' => 'Live preview has been disabled to support selected font', + 'invoice_number_padding' => 'Padding', + 'preview' => 'Preview', + 'list_vendors' => 'List Vendors', + 'add_users_not_supported' => 'Upgrade to the Enterprise plan to add additional users to your account.', + 'enterprise_plan_features' => 'The Enterprise plan adds support for multiple users and file attachments.', + 'return_to_app' => 'Return to app', + ); \ No newline at end of file diff --git a/resources/lang/nl/texts.php b/resources/lang/nl/texts.php index 83fef88816e1..6d19485ff8e8 100644 --- a/resources/lang/nl/texts.php +++ b/resources/lang/nl/texts.php @@ -10,15 +10,15 @@ return array( 'address' => 'Adres', 'address1' => 'Straat', 'address2' => 'Bus/Suite', - 'city' => 'Gemeente', + 'city' => 'Plaats', 'state' => 'Staat/Provincie', 'postal_code' => 'Postcode', 'country_id' => 'Land', - 'contacts' => 'Contacten', + 'contacts' => 'Contactpersonen', 'first_name' => 'Voornaam', 'last_name' => 'Achternaam', 'phone' => 'Telefoon', - 'email' => 'E-mail', + 'email' => 'E-mailadres', 'additional_info' => 'Extra informatie', 'payment_terms' => 'Betalingsvoorwaarden', 'currency_id' => 'Munteenheid', @@ -35,7 +35,7 @@ return array( 'invoice_number_short' => 'Factuur #', 'po_number' => 'Bestelnummer', 'po_number_short' => 'Bestel #', - 'frequency_id' => 'Hoe vaak', + 'frequency_id' => 'Frequentie', 'discount' => 'Korting', 'taxes' => 'Belastingen', 'tax' => 'Belasting', @@ -52,9 +52,9 @@ return array( 'your_invoice' => 'Jouw factuur', 'remove_contact' => 'Verwijder contact', - 'add_contact' => 'Voeg contact toe', + 'add_contact' => 'Contact toevoegen', 'create_new_client' => 'Maak nieuwe klant', - 'edit_client_details' => 'Pas klantdetails aan', + 'edit_client_details' => 'Klantdetails aanpassen', 'enable' => 'Activeer', 'learn_more' => 'Meer te weten komen', 'manage_rates' => 'Beheer prijzen', @@ -63,12 +63,12 @@ return array( 'save_as_default_terms' => 'Opslaan als standaard voorwaarden', 'download_pdf' => 'Download PDF', 'pay_now' => 'Betaal nu', - 'save_invoice' => 'Sla factuur op', + 'save_invoice' => 'Factuur opslaan', 'clone_invoice' => 'Kopieer factuur', 'archive_invoice' => 'Archiveer factuur', 'delete_invoice' => 'Verwijder factuur', 'email_invoice' => 'E-mail factuur', - 'enter_payment' => 'Betaling ingeven', + 'enter_payment' => 'Betaling invoeren', 'tax_rates' => 'BTW-tarief', 'rate' => 'Tarief', 'settings' => 'Instellingen', @@ -176,21 +176,21 @@ return array( 'amount' => 'Bedrag', // account/company pages - 'work_email' => 'E-mail', + 'work_email' => 'E-mailadres', 'language_id' => 'Taal', 'timezone_id' => 'Tijdszone', 'date_format_id' => 'Datum formaat', 'datetime_format_id' => 'Datum/Tijd formaat', 'users' => 'Gebruikers', 'localization' => 'Localisatie', - 'remove_logo' => 'Verwijder logo', + 'remove_logo' => 'Logo verwijderen', 'logo_help' => 'Ondersteund: JPEG, GIF en PNG', 'payment_gateway' => 'Betalingsmiddel', 'gateway_id' => 'Leverancier', 'email_notifications' => 'E-mailmeldingen', - 'email_sent' => 'E-mail me wanneer een factuur is verzonden', - 'email_viewed' => 'E-mail me wanneer een factuur is bekeken', - 'email_paid' => 'E-mail me wanneer een factuur is betaald', + 'email_sent' => 'E-mail mij wanneer een factuur is verzonden', + 'email_viewed' => 'E-mail mij wanneer een factuur is bekeken', + 'email_paid' => 'E-mail mij wanneer een factuur is betaald', 'site_updates' => 'Site Aanpassingen', 'custom_messages' => 'Aangepaste berichten', 'default_invoice_terms' => 'Stel standaard factuurvoorwaarden in', @@ -310,10 +310,10 @@ return array( 'close' => 'Sluiten', 'pro_plan_product' => 'Pro Plan', - 'pro_plan_description' => 'Één jaar abbonnement op het InvoiceNinja Pro Plan.', + 'pro_plan_description' => 'Eén jaar abbonnement op het InvoiceNinja Pro Plan.', 'pro_plan_success' => 'Bedankt voor het aanmelden! Zodra uw factuur betaald is zal uw Pro Plan lidmaatschap beginnen.', - 'unsaved_changes' => 'U hebt niet bewaarde wijzigingen', + 'unsaved_changes' => 'U hebt niet opgeslagen wijzigingen', 'custom_fields' => 'Aangepaste velden', 'company_fields' => 'Velden Bedrijf', 'client_fields' => 'Velden Klant', @@ -366,7 +366,7 @@ return array( 'archive_quote' => 'Archiveer offerte', 'delete_quote' => 'Verwijder offerte', 'save_quote' => 'Bewaar offerte', - 'email_quote' => 'Email offerte', + 'email_quote' => 'E-mail offerte', 'clone_quote' => 'Kloon offerte', 'convert_to_invoice' => 'Zet om naar factuur', 'view_invoice' => 'Bekijk factuur', @@ -404,10 +404,10 @@ return array( 'charge_taxes' => 'BTW berekenen', 'user_management' => 'Gebruikersbeheer', 'add_user' => 'Nieuwe gebruiker', - 'send_invite' => 'Verstuur uitnodiging', + 'send_invite' => 'Uitnodiging versturen', 'sent_invite' => 'Uitnodiging succesvol verzonden', 'updated_user' => 'Gebruiker succesvol aangepast', - 'invitation_message' => 'U bent uigenodigd door :invitor. ', + 'invitation_message' => 'U bent uitgenodigd door :invitor. ', 'register_to_add_user' => 'Meld u aan om een gebruiker toe te voegen', 'user_state' => 'Status', 'edit_user' => 'Bewerk gebruiker', @@ -417,11 +417,11 @@ return array( 'deleted_user' => 'Gebruiker succesvol verwijderd', 'limit_users' => 'Sorry, dit zou de limiet van '.MAX_NUM_USERS.' gebruikers overschrijden', - 'confirm_email_invoice' => 'Weet u zeker dat u deze factuur wilt mailen?', - 'confirm_email_quote' => 'Weet u zeker dat u deze offerte wilt mailen?', - 'confirm_recurring_email_invoice' => 'Terugkeren (herhalen) staat aan, weet u zeker dat u deze factuur wilt mailen?', + 'confirm_email_invoice' => 'Weet u zeker dat u deze factuur wilt e-mailen?', + 'confirm_email_quote' => 'Weet u zeker dat u deze offerte wilt e-mailen?', + 'confirm_recurring_email_invoice' => 'Terugkeren (herhalen) staat aan, weet u zeker dat u deze factuur wilt e-mailen?', - 'cancel_account' => 'Zeg Account Op', + 'cancel_account' => 'Account opzeggen', 'cancel_account_message' => 'Waarschuwing: Dit zal al uw data verwijderen. Er is geen manier om dit ongedaan te maken', 'go_back' => 'Ga Terug', @@ -457,10 +457,10 @@ return array( 'sent' => 'verzonden', 'timesheets' => 'Timesheets', - 'payment_title' => 'Geef uw betalingsadres en kredietkaartgegevens op', - 'payment_cvv' => '*Dit is de code van 3-4 tekens op de achterkant van uw kaart', + 'payment_title' => 'Geef uw betalingsadres en creditcardgegevens op', + 'payment_cvv' => '*Dit is de code van 3 of 4 tekens op de achterkant van uw kaart', 'payment_footer1' => '*Betalingsadres moet overeenkomen met het adres dat aan uw kaart gekoppeld is.', - 'payment_footer2' => '*Klik alstublieft slechts 1 keer op "PAY NOW" - verwerking kan tot 1 minuut duren.', + 'payment_footer2' => '*Klik alstublieft slechts één keer op "PAY NOW" - verwerking kan tot 1 minuut duren.', 'vat_number' => 'BTW-nummer', 'id_number' => 'Identificatienummer', @@ -489,7 +489,7 @@ return array( 'invoice_history' => 'Factuurgeschiedenis', 'quote_history' => 'Offertegeschiedenis', 'current_version' => 'Huidige versie', - 'select_versiony' => 'Selecteer versie', + 'select_version' => 'Selecteer versie', 'view_history' => 'Bekijk geschiedenis', 'edit_payment' => 'Bewerk betaling', @@ -498,20 +498,20 @@ return array( 'restore_user' => 'Herstel gebruiker', 'restored_user' => 'Gebruiker succesvol hersteld', 'show_deleted_users' => 'Toon verwijderde gebruikers', - 'email_templates' => 'Emailsjablonen', - 'invoice_email' => 'Factuuremail', - 'payment_email' => 'Betalingsemail', - 'quote_email' => 'Offerte-email', + 'email_templates' => 'E-mailsjablonen', + 'invoice_email' => 'Factuur-e-mail', + 'payment_email' => 'Betalings-e-mail', + 'quote_email' => 'Offerte-e-mail', 'reset_all' => 'Reset alles', 'approve' => 'Goedkeuren', 'token_billing_type_id' => 'Betalingstoken', - 'token_billing_help' => 'Stelt u in staat om kredietkaart gegevens bij uw gateway op te slaan en ze later te gebruiken.', + 'token_billing_help' => 'Stelt u in staat om creditcard gegevens bij uw gateway op te slaan en ze later te gebruiken.', 'token_billing_1' => 'Inactief', 'token_billing_2' => 'Opt-in - checkbox is getoond maar niet geselecteerd', 'token_billing_3' => 'Opt-out - checkbox is getoond en geselecteerd', 'token_billing_4' => 'Altijd', - 'token_billing_checkbox' => 'Sla kredietkaart gegevens op', + 'token_billing_checkbox' => 'Sla carditcard gegevens op', 'view_in_stripe' => 'In Stripe bekijken', 'use_card_on_file' => 'Gebruik opgeslagen kaart', 'edit_payment_details' => 'Betalingsdetails aanpassen', @@ -525,7 +525,7 @@ return array( 'billing_address' => 'Factuuradres', 'billing_method' => 'Betaalmethode', 'order_overview' => 'Orderoverzicht', - 'match_address' => '*Addres moet overeenkomen met adres van kredietkaart.', + 'match_address' => '*Adres moet overeenkomen met adres van creditcard.', 'click_once' => '*Klik alstublieft maar één keer; het kan een minuut duren om de betaling te verwerken.', 'default_invoice_footer' => 'Stel standaard factuurfooter in', @@ -550,7 +550,7 @@ return array( 'created_gateway' => 'Gateway succesvol aangemaakt', 'deleted_gateway' => 'Gateway succesvol verwijderd', 'pay_with_paypal' => 'PayPal', - 'pay_with_card' => 'Kredietkaart', + 'pay_with_card' => 'Creditcard', 'change_password' => 'Verander wachtwoord', 'current_password' => 'Huidig wachtwoord', @@ -572,17 +572,17 @@ return array( 'set_password' => 'Stel wachtwoord in', 'converted' => 'Omgezet', - 'email_approved' => 'Email me wanneer een offerte is goedgekeurd', + 'email_approved' => 'Email mij wanneer een offerte is goedgekeurd', 'notification_quote_approved_subject' => 'Offerte :invoice is goedgekeurd door :client', 'notification_quote_approved' => ':client heeft offerte :invoice goedgekeurd voor :amount.', 'resend_confirmation' => 'Verstuurd bevestingsmail opnieuw', 'confirmation_resent' => 'De bevestigingsmail is opnieuw verstuurd', 'gateway_help_42' => ':link om te registreren voor BitPay.Opmerking: gebruik een Legacy API Key, niet een API token.', - 'payment_type_credit_card' => 'Kredietkaart', + 'payment_type_credit_card' => 'Creditcard', 'payment_type_paypal' => 'PayPal', 'payment_type_bitcoin' => 'Bitcoin', - 'knowledge_base' => 'Kennis databank', + 'knowledge_base' => 'Kennisbank', 'partial' => 'Gedeeld', 'partial_remaining' => ':partial / :balance', @@ -591,11 +591,11 @@ return array( 'client_name' => 'Klantnaam', 'pdf_settings' => 'PDF-instellingen', 'product_settings' => 'Productinstellingen', - 'auto_wrap' => 'Automatisch lijn afbreken', + 'auto_wrap' => 'Automatisch regel afbreken', 'duplicate_post' => 'Opgelet: de volgende pagina is twee keer doorgestuurd. De tweede verzending is genegeerd.', 'view_documentation' => 'Bekijk documentatie', 'app_title' => 'Gratis Open-Source Online Facturatie', - 'app_description' => 'Invoice Ninja is een gratis, open-source oplossing voor het aanmkaen en versturen van facturen aan klanten. Met Invoice Ninja, kun je gemakkelijk mooie facturen aanmaken en verzenden van om het even welk toestel met internettoegang. Je klanten kunnen je facturen afdrukken, downloaden als pdf bestanden en je zelfs online betalen vanuit het systeem.', + 'app_description' => 'Invoice Ninja is een gratis, open-source oplossing voor het maken en versturen van facturen aan klanten. Met Invoice Ninja, kun je gemakkelijk mooie facturen maken en verzenden vanaf elk apparaat met internettoegang. Je klanten kunnen je facturen afdrukken, downloaden als pdf bestand en je zelfs online betalen vanuit het systeem.', 'rows' => 'rijen', 'www' => 'www', @@ -635,7 +635,7 @@ return array( 'timer' => 'Timer', 'manual' => 'Manueel', 'date_and_time' => 'Datum en tijd', - 'second' => 'second', + 'second' => 'seconde', 'seconds' => 'seconden', 'minute' => 'minuut', 'minutes' => 'minuten', @@ -670,9 +670,9 @@ return array( 'pro_plan_title' => 'NINJA PRO', 'pro_plan_call_to_action' => 'Nu upgraden!', - 'pro_plan_feature1' => 'Maak ongelimiteerd klanten aan', + 'pro_plan_feature1' => 'Ongelimiteerd klanten aanmaken', 'pro_plan_feature2' => 'Toegang tot 10 mooie factuur ontwerpen', - 'pro_plan_feature3' => 'Aangepaste URLs - "YourBrand.InvoiceNinja.com"', + 'pro_plan_feature3' => 'Aangepaste URLs - "UwMerk.InvoiceNinja.com"', 'pro_plan_feature4' => 'Verwijder "Aangemaakt door Invoice Ninja"', 'pro_plan_feature5' => 'Multi-user toegang & Activeit Tracking', 'pro_plan_feature6' => 'Maak offertes & Pro-forma facturen aan', @@ -696,14 +696,14 @@ return array( 'login' => 'Login', 'or' => 'of', - 'email_error' => 'Er was een probleem om de email te verzenden', - 'confirm_recurring_timing' => 'Opmerking: emails worden aan het begin van het uur verzonden.', - 'old_browser' => 'Gebruik a.u.b. een nieuwere browser', + 'email_error' => 'Er was een probleem met versturen van de e-mail', + 'confirm_recurring_timing' => 'Opmerking: e-mails worden aan het begin van het uur verzonden.', + 'old_browser' => 'Gebruik a.u.b. een moderne browser', 'payment_terms_help' => 'Stel de standaard factuurvervaldatum in', 'unlink_account' => 'Koppel account los', 'unlink' => 'Koppel los', 'show_address' => 'Toon Adres', - 'show_address_help' => 'Verplicht de klant om zijn factuur adres op te geven', + 'show_address_help' => 'Verplicht de klant om zijn factuuradres op te geven', 'update_address' => 'Adres aanpassen', 'update_address_help' => 'Pas het adres van de klant aan met de ingevulde gegevens', 'times' => 'Tijden', @@ -718,7 +718,7 @@ return array( 'font_size' => 'Tekstgrootte', 'primary_color' => 'Primaire kleur', 'secondary_color' => 'Secundaire kleur', - 'customize_design' => 'Pas design aan', + 'customize_design' => 'Pas ontwerp aan', 'content' => 'Inhoud', 'styles' => 'Stijlen', @@ -740,9 +740,9 @@ return array( 'created_by_invoice' => 'Aangemaakt door :invoice', 'primary_user' => 'Primaire gebruiker', 'help' => 'Help', - 'customize_help' => '
We gebruiken pdfmake om de factuur ontwerpen declaratief te definieren. De pdfmake playground is een interessante manier om de library in actie te zien.
-Gebruik dot notatie om een "kind eigenschap" te gebruiken. Bijvoorbeeld voor de klant naam te tonen gebruik je $client.name.
Als je ergens hulp bij nodig hebt, post dan een vraag op ons support forum.
', + 'customize_help' => 'We gebruiken pdfmake om de factuurontwerpen declaratief te definieren. De pdfmake playground is een interessante manier om de library in actie te zien.
+Gebruik puntnotatie om een "dochter eigenschap" te gebruiken. Bijvoorbeeld: om de naam van een klant te tonen gebruik je $client.name.
Als je ergens hulp bij nodig hebt, stel dan een vraag op ons support forum.
', 'invoice_due_date' => 'Vervaldatum', 'quote_due_date' => 'Geldig tot', @@ -763,11 +763,11 @@ return array( 'iframe_url_help2' => 'U kunt de functionaliteit testen door te klikken op \'Bekijk als ontvanger\' bij een factuur.', 'auto_bill' => 'Automatische incasso', - 'military_time' => '24 uurs tijd', + 'military_time' => '24-uurs klok', 'last_sent' => 'Laatst verstuurd', - 'reminder_emails' => 'Herinneringse-mails', - 'templates_and_reminders' => 'Templates en herinneringen', + 'reminder_emails' => 'Herinnerings-e-mails', + 'templates_and_reminders' => 'Sjablonen en herinneringen', 'subject' => 'Onderwerp', 'body' => 'Tekst', 'first_reminder' => 'Eerste herinnering', @@ -787,17 +787,17 @@ return array( 'expired_quotes' => 'Verlopen offertes', 'sign_up_using' => 'Meld u aan met', - 'invalid_credentials' => 'Deze credentials zijn niet bij ons bekend', + 'invalid_credentials' => 'Deze inloggegevens zijn niet bij ons bekend', 'show_all_options' => 'Alle opties tonen', 'user_details' => 'Gebruiker gegevens', 'oneclick_login' => 'One-Click Login', 'disable' => 'Uitzetten', - 'invoice_quote_number' => 'Factuur en offerte nummers', - 'invoice_charges' => 'Facturatie kosten', + 'invoice_quote_number' => 'Factuur- en offertenummers', + 'invoice_charges' => 'Facturatiekosten', 'invitation_status' => [ - 'sent' => 'Email verstuurd', - 'opened' => 'Email geopend', + 'sent' => 'E-mail verstuurd', + 'opened' => 'E-mail geopend', 'viewed' => 'Factuur bekeken', ], 'notification_invoice_bounced' => 'We konden factuur :invoice niet afleveren bij :contact.', @@ -808,7 +808,7 @@ return array( 'custom_invoice_link' => 'Eigen factuurlink', 'total_invoiced' => 'Totaal gefactureerd', 'open_balance' => 'Openstaand bedrag', - 'verify_email' => 'Klik alstublieft op de link in de accountbevestigingse-mail om uw e-mailadres te bevestigen.', + 'verify_email' => 'Klik alstublieft op de link in de accountbevestigings-e-mail om uw e-mailadres te bevestigen.', 'basic_settings' => 'Basisinstellingen', 'pro' => 'Pro', 'gateways' => 'Betalingsverwerkers', @@ -817,7 +817,7 @@ return array( 'next_send_on' => 'Verstuur volgende: :date', 'no_longer_running' => 'Deze factuur is niet ingepland', 'general_settings' => 'Algemene instellingen', - 'customize' => 'Pas aan', + 'customize' => 'Aanpassen', 'oneclick_login_help' => 'Verbind een account om zonder wachtwoord in te kunnen loggen', 'referral_code_help' => 'Verdien geld door onze applicatie online te delen', @@ -842,39 +842,39 @@ return array( 'quote_counter' => 'Offerteteller', 'type' => 'Type', - 'activity_1' => ':user created client :client', - 'activity_2' => ':user archived client :client', - 'activity_3' => ':user deleted client :client', - 'activity_4' => ':user created invoice :invoice', - 'activity_5' => ':user updated invoice :invoice', - 'activity_6' => ':user emailed invoice :invoice to :contact', - 'activity_7' => ':contact viewed invoice :invoice', - 'activity_8' => ':user archived invoice :invoice', - 'activity_9' => ':user deleted invoice :invoice', - 'activity_10' => ':contact entered payment :payment for :invoice', - 'activity_11' => ':user updated payment :payment', - 'activity_12' => ':user archived payment :payment', - 'activity_13' => ':user deleted payment :payment', - 'activity_14' => ':user entered :credit credit', - 'activity_15' => ':user updated :credit credit', - 'activity_16' => ':user archived :credit credit', - 'activity_17' => ':user deleted :credit credit', - 'activity_18' => ':user created quote :quote', - 'activity_19' => ':user updated quote :quote', - 'activity_20' => ':user emailed quote :quote to :contact', - 'activity_21' => ':contact viewed quote :quote', - 'activity_22' => ':user archived quote :quote', - 'activity_23' => ':user deleted quote :quote', - 'activity_24' => ':user restored quote :quote', - 'activity_25' => ':user restored invoice :invoice', - 'activity_26' => ':user restored client :client', - 'activity_27' => ':user restored payment :payment', - 'activity_28' => ':user restored :credit credit', - 'activity_29' => ':contact approved quote :quote', + 'activity_1' => ':user heeft klant :client aangemaakt', + 'activity_2' => ':user heeft klant :client gearchiveerd', + 'activity_3' => ':user heeft klant :client verwijderd', + 'activity_4' => ':user heeft factuur :invoice aangemaakt', + 'activity_5' => ':user heeft factuur :invoice bijgewerkt', + 'activity_6' => ':user heeft factuur :invoice verstuurd naar :contact', + 'activity_7' => ':contact heeft factuur :invoice bekeken', + 'activity_8' => ':user heeft factuur :invoice gearchiveerd', + 'activity_9' => ':user heeft factuur :invoice verwijderd', + 'activity_10' => ':contact heeft betaling :payment ingevoerd voor factuur :invoice', + 'activity_11' => ':user heeft betaling :payment bijgewerkt', + 'activity_12' => ':user heeft betaling :payment gearchiveerd', + 'activity_13' => ':user heeft betaling :payment verwijderd', + 'activity_14' => ':user heeft :credit krediet ingevoerd', + 'activity_15' => ':user heeft :credit krediet bijgewerkt', + 'activity_16' => ':user heeft :credit krediet gearchiveerd', + 'activity_17' => ':user heeft :credit krediet verwijderd', + 'activity_18' => ':user heeft offerte :quote aangemaakt', + 'activity_19' => ':user heeft offerte :quote bijgewerkt', + 'activity_20' => ':user heeft offerte :quote verstuurd naar :contact', + 'activity_21' => ':contact heeft offerte :quote bekeken', + 'activity_22' => ':user heeft offerte :quote gearchiveerd', + 'activity_23' => ':user heeft offerte :quote verwijderd', + 'activity_24' => ':user heeft offerte :quote hersteld', + 'activity_25' => ':user heeft factuur :invoice hersteld', + 'activity_26' => ':user heeft klant :client hersteld', + 'activity_27' => ':user heeft betaling :payment hersteld', + 'activity_28' => ':user heeft :credit krediet hersteld', + 'activity_29' => ':contact heeft offerte :quote goedgekeurd', 'payment' => 'Betaling', 'system' => 'Systeem', - 'signature' => 'Emailondertekening', + 'signature' => 'E-mailhandtekening', 'default_messages' => 'Standaardberichten', 'quote_terms' => 'Offertevoorwaarden', 'default_quote_terms' => 'Standaard offertevoorwaarden', @@ -884,7 +884,7 @@ return array( 'free' => 'Gratis', 'quote_is_approved' => 'Deze offerte is geaccordeerd', - 'apply_credit' => 'Apply Credit', + 'apply_credit' => 'Krediet gebruiken', 'system_settings' => 'Systeeminstellingen', 'archive_token' => 'Archiveer token', 'archived_token' => 'Token succesvol gearchiveerd', @@ -910,289 +910,374 @@ return array( 'country' => 'Land', 'include' => 'Voeg in', - 'logo_too_large' => 'Your logo is :size, for better PDF performance we suggest uploading an image file less than 200KB', - 'import_freshbooks' => 'Import From FreshBooks', + 'logo_too_large' => 'Je logo is :size groot, voor betere PDF prestaties raden we je aan om een afbeelding kleiner dan 200KB te uploaden.', + 'import_freshbooks' => 'Importeren van FreshBooks', 'import_data' => 'Importeer data', 'source' => 'Bron', 'csv' => 'CSV', - 'client_file' => 'Klantbestand', + 'client_file' => 'Klantenbestand', 'invoice_file' => 'Factuurbestand', 'task_file' => 'Urenbestand', - 'no_mapper' => 'No valid mapping for file', - 'invalid_csv_header' => 'Invalid CSV Header', + 'no_mapper' => 'Geen geldige mapping voor bestand', + 'invalid_csv_header' => 'Ongeldige CSV kop', 'email_errors' => [ - 'inactive_client' => 'Emails can not be sent to inactive clients', - 'inactive_contact' => 'Emails can not be sent to inactive contacts', - 'inactive_invoice' => 'Emails can not be sent to inactive invoices', - 'user_unregistered' => 'Please register your account to send emails', - 'user_unconfirmed' => 'Please confirm your account to send emails', - 'invalid_contact_email' => 'Invalid contact email', + 'inactive_client' => 'E-mails kunnen niet worden verstuurd naar inactieve klanten', + 'inactive_contact' => 'E-mails kunnen niet worden verstuurd naar inactieve contactpersonen', + 'inactive_invoice' => 'E-mails kunnen niet worden verstuurd naar inactieve facturen', + 'user_unregistered' => 'Registreer een account om e-mails te kunnen versturen', + 'user_unconfirmed' => 'Bevestig uw account om e-mails te kunnen versturen', + 'invalid_contact_email' => 'Ongeldig e-mailadres van contactpersoon', ], - 'client_portal' => 'Klantportaal', + 'client_portal' => 'Klantenportaal', 'admin' => 'Admin', 'disabled' => 'Uitgeschakeld', 'show_archived_users' => 'Toon gearchiveerde gebruikers', 'notes' => 'Notities', 'invoice_will_create' => 'klant zal worden aangemaakt', 'invoices_will_create' => 'factuur zal worden aangemaakt', - 'failed_to_import' => 'The following records failed to import, they either already exist or are missing required fields.', + 'failed_to_import' => 'De volgende regels konden niet worden geïmporteerd, ze bestaan al of missen verplichte velden.', 'publishable_key' => 'Publishable Key', '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 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 Style', - 'email_design_help' => 'Make your emails look more professional with HTML layouts', - 'plain' => 'Plain', - 'light' => 'Light', - 'dark' => 'Dark', + 'email_design' => 'E-mail Ontwerp', + 'due_by' => 'Vervaldatum :date', + 'enable_email_markup' => 'Opmaak inschakelen', + 'enable_email_markup_help' => 'Maak het gemakkelijker voor uw klanten om te betalen door scherma.org opmaak toe te voegen aan uw e-mails.', + 'template_help_title' => 'Hulp bij sjablonen', + 'template_help_1' => 'Beschikbare variabelen:', + 'email_design_id' => 'E-mail stijl', + 'email_design_help' => 'Geef uw e-mails een professionele uitstraling met HTML ontwerpen', + 'plain' => 'Platte tekst', + 'light' => 'Licht', + 'dark' => 'Donker', - 'industry_help' => 'Used to provide comparisons against the averages of companies of similar size and industry.', - 'subdomain_help' => 'Customize the invoice link subdomain or display the invoice on your own website.', - 'invoice_number_help' => 'Specify a prefix or use a custom pattern to dynamically set the invoice number.', - 'quote_number_help' => 'Specify a prefix or use a custom pattern to dynamically set the quote number.', - 'custom_client_fields_helps' => 'Add a text input to the client create/edit page and display the label and value on the PDF.', - 'custom_account_fields_helps' => 'Add a label and value to the company details section of the PDF.', - 'custom_invoice_fields_helps' => 'Add a text input to the invoice create/edit page and display the label and value on the PDF.', - 'custom_invoice_charges_helps' => 'Add a text input to the invoice create/edit page and include the charge in the invoice subtotals.', - 'color_help' => 'Note: the primary color is also used in the client portal and custom email designs.', + 'industry_help' => 'Wordt gebruikt om een vergelijking te kunnen maken met de gemiddelden van andere bedrijven uit dezelfde sector en van dezelfde grootte.', + 'subdomain_help' => 'Pas het factuur link subdomein aan of toon de factuur op uw eigen website.', + 'invoice_number_help' => 'Kies een voorvoegsel of gebruik een patroon om het factuurnummer dynamisch te genereren.', + 'quote_number_help' => 'Kies een voorvoegsel of gebruik een patroon om het offertenummer dynamisch te genereren.', + 'custom_client_fields_helps' => 'Plaatst een tekstveld op de klanten aanmaak-/bewerkpagina en toont het gekozen label op de PDF.', + 'custom_account_fields_helps' => 'Plaatst een tekstveld op de bedrijven aanmaak-/bewerkpagina en toont het gekozen label op de PDF.', + 'custom_invoice_fields_helps' => 'Plaatst een tekstveld op de factuur aanmaak-/bewerkpagina en toont het gekozen label op de PDF.', + 'custom_invoice_charges_helps' => 'Plaatst een tekstveld op de factuur aanmaak-/bewerkpagina en verwerkt de facturatiekosten in het subtotaal.', + 'color_help' => 'Opmerking: de primaire kleur wordt ook gebruikt in het klantenportaal en in aangepaste e-mailontwerpen.', - 'token_expired' => 'Validation token was expired. Please try again.', - 'invoice_link' => 'Invoice Link', - 'button_confirmation_message' => 'Click to confirm your email address.', - 'confirm' => 'Confirm', - 'email_preferences' => 'Email Preferences', - 'created_invoices' => 'Successfully created :count invoice(s)', - 'next_invoice_number' => 'The next invoice number is :number.', - 'next_quote_number' => 'The next quote number is :number.', + 'token_expired' => 'De validatie token is verlopen. Probeer het opnieuw.', + 'invoice_link' => 'Factuur Link', + 'button_confirmation_message' => 'Klik om uw e-mailadres te bevestigen.', + 'confirm' => 'Bevestigen', + 'email_preferences' => 'E-mailvoorkeuren', + 'created_invoices' => ':count facturen succesvol aangemaakt', //TODO: Implement pluralization? + 'next_invoice_number' => 'Het volgende factuurnummer is :number.', + 'next_quote_number' => 'Het volgende offertenummer is :number.', - 'days_before' => 'days before', - 'days_after' => 'days after', - 'field_due_date' => 'due date', - 'field_invoice_date' => 'invoice date', - 'schedule' => 'Schedule', - 'email_designs' => 'Email Designs', - 'assigned_when_sent' => 'Assigned when sent', + 'days_before' => 'dagen voor', + 'days_after' => 'dagen na', + 'field_due_date' => 'vervaldatum', + 'field_invoice_date' => 'factuurdatum', + 'schedule' => 'Schema', + 'email_designs' => 'E-mail Ontwerpen', + 'assigned_when_sent' => 'Toegwezen zodra verzonden', - 'white_label_custom_css' => ':link for $'.WHITE_LABEL_PRICE.' to enable custom styling and help support our project.', - 'white_label_purchase_link' => 'Purchase a white label license', + 'white_label_custom_css' => ':link voor $'.WHITE_LABEL_PRICE.' om eigen opmaak te gebruiken en ons project te ondersteunen.', + 'white_label_purchase_link' => 'Koop een whitelabel licentie', // Expense / vendor - 'expense' => 'Expense', - 'expenses' => 'Expenses', - 'new_expense' => 'Enter Expense', - 'enter_expense' => 'Enter Expense', - 'vendors' => 'Vendors', - 'new_vendor' => 'New Vendor', - 'payment_terms_net' => 'Net', - 'vendor' => 'Vendor', - 'edit_vendor' => 'Edit Vendor', - 'archive_vendor' => 'Archive Vendor', - 'delete_vendor' => 'Delete Vendor', - 'view_vendor' => 'View Vendor', - 'deleted_expense' => 'Successfully deleted expense', - 'archived_expense' => 'Successfully archived expense', - 'deleted_expenses' => 'Successfully deleted expenses', - 'archived_expenses' => 'Successfully archived expenses', + 'expense' => 'Uitgave', + 'expenses' => 'Uitgaven', + 'new_expense' => 'Nieuwe uitgave', + 'enter_expense' => 'Uitgave invoeren', + 'vendors' => 'Verkopers', + 'new_vendor' => 'Nieuwe verkoper', + 'payment_terms_net' => 'Betaaltermijn', + 'vendor' => 'Verkoper', + 'edit_vendor' => 'Bewerk verkoper', + 'archive_vendor' => 'Archiveer verkoper', + 'delete_vendor' => 'Verwijder verkoper', + 'view_vendor' => 'Bekijk verkoper', + 'deleted_expense' => 'Uitgave succesvol verwijderd', + 'archived_expense' => 'Uitgave succesvol gearchiveerd', + 'deleted_expenses' => 'Uitgaven succesvol verwijderd', + 'archived_expenses' => 'Uitgaven succesvol gearchiveerd', // Expenses - 'expense_amount' => 'Expense Amount', - 'expense_balance' => 'Expense Balance', - 'expense_date' => 'Expense Date', - 'expense_should_be_invoiced' => 'Should this expense be invoiced?', - 'public_notes' => 'Public Notes', - 'invoice_amount' => 'Invoice Amount', - 'exchange_rate' => 'Exchange Rate', - 'yes' => 'Yes', - 'no' => 'No', - 'should_be_invoiced' => 'Should be invoiced', - 'view_expense' => 'View expense # :expense', - 'edit_expense' => 'Edit Expense', - 'archive_expense' => 'Archive Expense', - 'delete_expense' => 'Delete Expense', - 'view_expense_num' => 'Expense # :expense', - 'updated_expense' => 'Successfully updated expense', - 'created_expense' => 'Successfully created expense', - 'enter_expense' => 'Enter Expense', - 'view' => 'View', - 'restore_expense' => 'Restore Expense', - 'invoice_expense' => 'Invoice Expense', - 'expense_error_multiple_clients' => 'The expenses can\'t belong to different clients', - 'expense_error_invoiced' => 'Expense has already been invoiced', - 'convert_currency' => 'Convert currency', + 'expense_amount' => 'Uitgave bedrag', + 'expense_balance' => 'Uitgave saldo', + 'expense_date' => 'Uitgave datum', + 'expense_should_be_invoiced' => 'Moet deze uitgave worden gefactureerd?', + 'public_notes' => 'Publieke opmerkingen', + 'invoice_amount' => 'Factuurbedrag', + 'exchange_rate' => 'Wisselkoers', + 'yes' => 'Ja', + 'no' => 'Nee', + 'should_be_invoiced' => 'Moet worden gefactureerd', + 'view_expense' => 'Bekijk uitgave #:expense', + 'edit_expense' => 'Bewerk uitgave', + 'archive_expense' => 'Archiveer uitgave', + 'delete_expense' => 'Verwijder uitgave', + 'view_expense_num' => 'Uitgave #:expense', + 'updated_expense' => 'Uitgave succesvol bijgewerkt', + 'created_expense' => 'Uitgave succesvol aangemaakt', + 'enter_expense' => 'Uitgave invoeren', + 'view' => 'Bekijken', + 'restore_expense' => 'Herstel uitgave', + 'invoice_expense' => 'Factuur uitgave', + 'expense_error_multiple_clients' => 'De uitgaven kunnen niet bij verschillende klanten horen', + 'expense_error_invoiced' => 'Uitgave is al gefactureerd', + 'convert_currency' => 'Valuta omrekenen', // Payment terms - 'num_days' => 'Number of days', - 'create_payment_term' => 'Create Payment Term', - 'edit_payment_terms' => 'Edit Payment Term', - 'edit_payment_term' => 'Edit Payment Term', - 'archive_payment_term' => 'Archive Payment Term', + 'num_days' => 'Aantal dagen', + 'create_payment_term' => 'Betalingstermijn aanmaken', + 'edit_payment_terms' => 'Bewerk betalingstermijnen', + 'edit_payment_term' => 'Bewerk betalingstermijn', + 'archive_payment_term' => 'Archiveer betalingstermijn', // recurring due dates - 'recurring_due_dates' => 'Recurring Invoice Due Dates', - 'recurring_due_date_help' => 'Automatically sets a due date for the invoice.
-Invoices on a monthly or yearly cycle set to be due on or before the day they are created will be due the next month. Invoices set to be due on the 29th or 30th in months that don\'t have that day will be due the last day of the month.
-Invoices on a weekly cycle set to be due on the day of the week they are created will be due the next week.
-For example:
+ 'recurring_due_dates' => 'Vervaldatums van terugkerende facturen', + 'recurring_due_date_help' => 'Stelt automatisch een vervaldatum in voor de factuur.
+Facturen die maandelijks of jaarlijks terugkeren en ingesteld zijn om te vervallen op of voor de datum waarop ze gemaakt zijn zullen de volgende maand vervallen. Facturen die ingesteld zijn te vervallen op de 29e of 30e van een maand die deze dag niet heeft zullen vervallen op de laatste dag van die maand.
+Facturen die wekelijks terugkeren en ingesteld zijn om te vervallen op de dag van de week dat ze gemaakt zijn zullen de volgende week vervallen.
+Bijvoorbeeld:
-
-
- Today is the 15th, due date is 1st of the month. The due date should likely be the 1st of the next month. -
- Today is the 15th, due date is the last day of the month. The due date will be the last day of the this month. - -
- Today is the 15th, due date is the 15th day of the month. The due date will be the 15th day of next month. - -
- Today is the Friday, due date is the 1st Friday after. The due date will be next Friday, not today. - +
- Vandaag is het de 15e, de vervaldatum is ingesteld op de eerste dag van de maand. De vervaldatum zal de eerste dag van de volgende maand zijn. +
- Vandaag is het de 15e, de vervaldatum is ingesteld op de laatste dag van de maand. De vervaldatum zal de laatste dag van deze maand zijn. +
- Vandaag is het de 15e, de vervaldatum is ingesteld op de 15e dag van de maand. De vervaldatum zal de 15e dag van de volgende maand zijn. +
- Vandaag is het vrijdag, de vervaldatum is ingesteld op de 1e vrijdag erna. De vervaldatum zal volgende week vrijdag zijn, niet vandaag.
Wysyła automatycznie te same faktury klientom tygodniowo, miesięcznie, kwartałowo lub rocznie.
+Użyj :MONTH, :QUARTER lub :YEAR dla dynamicznych dat. Podstawowa arytmetyka działa również, np: :MONTH-1.
+Przykłady dynamicznych zmiennych na fakturze:
+-
+
- "Gym membership for the month of :MONTH" => "Gym membership for the month of July" +
- ":YEAR+1 yearly subscription" => "2015 Yearly Subscription" +
- "Retainer payment for :QUARTER+1" => "Retainer payment for Q2" +
+ Next StepsA payable invoice has been sent to the email + address associated with your account. To unlock all of the awesome + Pro features, please follow the instructions on the invoice to pay + for a year of Pro-level invoicing. + Can\'t find the invoice? Need further assistance? We\'re happy to help + -- email us at contact@invoiceninja.com', + 'unsaved_changes' => 'You have unsaved changes', + 'custom_fields' => 'Custom Fields', + 'company_fields' => 'Company Fields', + 'client_fields' => 'Client Fields', + 'field_label' => 'Field Label', + 'field_value' => 'Field Value', + 'edit' => 'Edytuj', + 'set_name' => 'Set your company name', + 'view_as_recipient' => 'View as recipient', + 'product_library' => 'Product Library', + 'product' => 'Produkt', + 'products' => 'Produkty', + 'fill_products' => 'Auto-fill products', + 'fill_products_help' => 'Selecting a product will automatically fill in the description and cost', + 'update_products' => 'Auto-update products', + 'update_products_help' => 'Updating an invoice will automatically update the product library', + 'create_product' => 'Add Product', + 'edit_product' => 'Edit Product', + 'archive_product' => 'Archive Product', + 'updated_product' => 'Successfully updated product', + 'created_product' => 'Successfully created product', + 'archived_product' => 'Successfully archived product', + 'pro_plan_custom_fields' => ':link to enable custom fields by joining the Pro Plan', + 'advanced_settings' => 'Advanced Settings', + 'pro_plan_advanced_settings' => ':link to enable the advanced settings by joining the Pro Plan', + 'invoice_design' => 'Invoice Design', + 'specify_colors' => 'Specify colors', + 'specify_colors_label' => 'Select the colors used in the invoice', + 'chart_builder' => 'Chart Builder', + 'ninja_email_footer' => 'Use :site to invoice your clients and get paid online for free!', + 'go_pro' => 'Go Pro', + 'quote' => 'Oferta', + 'quotes' => 'Oferty', + 'quote_number' => 'Numer oferty', + 'quote_number_short' => 'Oferta #', + 'quote_date' => 'Data oferty', + 'quote_total' => 'Suma oferty', + 'your_quote' => 'Twoja oferta', + 'total' => 'Suma', + 'clone' => 'Clone', + 'new_quote' => 'Nowa oferta', + 'create_quote' => 'Stwórz ofertę', + 'edit_quote' => 'Edytuj ofertę', + 'archive_quote' => 'Archiwizuj ofertę', + 'delete_quote' => 'Usuń ofertę', + 'save_quote' => 'Zapisz ofertę', + 'email_quote' => 'Wyślij ofertę', + 'clone_quote' => 'Clone Quote', + 'convert_to_invoice' => 'Konwertuj do faktury', + 'view_invoice' => 'Zobacz fakturę', + 'view_client' => 'Zobacz klienta', + 'view_quote' => 'Zobacz ofertę', + 'updated_quote' => 'Successfully updated quote', + 'created_quote' => 'Successfully created quote', + 'cloned_quote' => 'Successfully cloned quote', + 'emailed_quote' => 'Successfully emailed quote', + 'archived_quote' => 'Successfully archived quote', + 'archived_quotes' => 'Successfully archived :count quotes', + 'deleted_quote' => 'Successfully deleted quote', + 'deleted_quotes' => 'Successfully deleted :count quotes', + 'converted_to_invoice' => 'Successfully converted quote to invoice', + 'quote_subject' => 'New quote $quote from :account', + 'quote_message' => 'To view your quote for :amount, click the link below.', + 'quote_link_message' => 'To view your client quote click the link below:', + 'notification_quote_sent_subject' => 'Quote :invoice was sent to :client', + 'notification_quote_viewed_subject' => 'Quote :invoice was viewed by :client', + 'notification_quote_sent' => 'The following client :client was emailed Quote :invoice for :amount.', + 'notification_quote_viewed' => 'The following client :client viewed Quote :invoice for :amount.', + 'session_expired' => 'Your session has expired.', + 'invoice_fields' => 'Invoice Fields', + 'invoice_options' => 'Invoice Options', + 'hide_quantity' => 'Hide Quantity', + 'hide_quantity_help' => 'If your line items quantities are always 1, then you can declutter invoices by no longer displaying this field.', + 'hide_paid_to_date' => 'Hide Paid to Date', + 'hide_paid_to_date_help' => 'Only display the "Paid to Date" area on your invoices once a payment has been received.', + 'charge_taxes' => 'Charge taxes', + 'user_management' => 'User Management', + 'add_user' => 'Add User', + 'send_invite' => 'Send invitation', + 'sent_invite' => 'Successfully sent invitation', + 'updated_user' => 'Successfully updated user', + 'invitation_message' => 'You\'ve been invited by :invitor. ', + 'register_to_add_user' => 'Please sign up to add a user', + 'user_state' => 'State', + 'edit_user' => 'Edit User', + 'delete_user' => 'Delete User', + 'active' => 'Active', + 'pending' => 'Pending', + 'deleted_user' => 'Successfully deleted user', + 'confirm_email_invoice' => 'Are you sure you want to email this invoice?', + 'confirm_email_quote' => 'Are you sure you want to email this quote?', + 'confirm_recurring_email_invoice' => 'Are you sure you want this invoice emailed?', + 'cancel_account' => 'Usuń konto', + 'cancel_account_message' => 'Warning: This will permanently erase all of your data, there is no undo.', + 'go_back' => 'Go Back', + 'data_visualizations' => 'Data Visualizations', + 'sample_data' => 'Sample data shown', + 'hide' => 'Hide', + 'new_version_available' => 'A new version of :releases_link is available. You\'re running v:user_version, the latest is v:latest_version', + 'invoice_settings' => 'Invoice Settings', + 'invoice_number_prefix' => 'Invoice Number Prefix', + 'invoice_number_counter' => 'Invoice Number Counter', + 'quote_number_prefix' => 'Quote Number Prefix', + 'quote_number_counter' => 'Quote Number Counter', + 'share_invoice_counter' => 'Share invoice counter', + 'invoice_issued_to' => 'Invoice issued to', + 'invalid_counter' => 'To prevent a possible conflict please set either an invoice or quote number prefix', + 'mark_sent' => 'Mark Sent', + 'gateway_help_1' => ':link to sign up for Authorize.net.', + 'gateway_help_2' => ':link to sign up for Authorize.net.', + 'gateway_help_17' => ':link to get your PayPal API signature.', + 'gateway_help_27' => ':link to sign up for TwoCheckout.', + 'more_designs' => 'More designs', + 'more_designs_title' => 'Additional Invoice Designs', + 'more_designs_cloud_header' => 'Go Pro for more invoice designs', + 'more_designs_cloud_text' => '', + 'more_designs_self_host_text' => '', + 'buy' => 'Buy', + 'bought_designs' => 'Successfully added additional invoice designs', + 'sent' => 'sent', + 'vat_number' => 'VAT Number', + 'timesheets' => 'Timesheets', + 'payment_title' => 'Enter Your Billing Address and Credit Card information', + 'payment_cvv' => '*This is the 3-4 digit number onthe back of your card', + 'payment_footer1' => '*Billing address must match address associated with credit card.', + 'payment_footer2' => '*Please click "PAY NOW" only once - transaction may take up to 1 minute to process.', + 'id_number' => 'ID Number', + 'white_label_link' => 'White label', + 'white_label_header' => 'White Label', + 'bought_white_label' => 'Successfully enabled white label license', + 'white_labeled' => 'White labeled', + 'restore' => 'Przywróć', + 'restore_invoice' => 'Przywróć fakturę', + 'restore_quote' => 'Przywróć ofertę', + 'restore_client' => 'Przywróć klienta', + 'restore_credit' => 'Przywróć kredyt', + 'restore_payment' => 'Przywróć płatność', + 'restored_invoice' => 'Faktura została przywrócona', + 'restored_quote' => 'Oferta została przywrócona', + 'restored_client' => 'Klient został przywrócony', + 'restored_payment' => 'Płatność została przywrócona', + 'restored_credit' => 'Kredyt został przywrócony', + 'reason_for_canceling' => 'Help us improve our site by telling us why you\'re leaving.', + 'discount_percent' => 'Procent', + 'discount_amount' => 'Kwota', + 'invoice_history' => 'Historia faktury', + 'quote_history' => 'Historia oferty', + 'current_version' => 'Aktualna wersja', + 'select_version' => 'Wybierz wersję', + 'view_history' => 'Zobacz historię', + 'edit_payment' => 'Edytuj płatność', + 'updated_payment' => 'Successfully updated payment', + 'deleted' => 'Usunięte', + 'restore_user' => 'Przywróć użytkownika', + 'restored_user' => 'Użytkownik został przywrócony', + 'show_deleted_users' => 'Pokaż usuniętych użytkowników', + 'email_templates' => 'Szablony e-mail', + 'invoice_email' => 'Email faktury', + 'payment_email' => 'Email płatności', + 'quote_email' => 'Email oferty', + 'reset_all' => 'Resetuj wszystko', + 'approve' => 'Zatwierdź', + 'token_billing_type_id' => 'Token Billing', + 'token_billing_help' => 'Enables you to store credit cards with your gateway, and charge them at a later date.', + 'token_billing_1' => 'Wyłączone', + 'token_billing_2' => 'Opt-in - checkbox is shown but not selected', + 'token_billing_3' => 'Opt-out - checkbox is shown and selected', + 'token_billing_4' => 'Zawsze', + 'token_billing_checkbox' => 'Store credit card details', + 'view_in_stripe' => 'View in Stripe', + 'use_card_on_file' => 'Use card on file', + 'edit_payment_details' => 'Edit payment details', + 'token_billing' => 'Save card details', + 'token_billing_secure' => 'The data is stored securely by :stripe_link', + 'support' => 'Support', + 'contact_information' => 'Contact Information', + '256_encryption' => '256-Bit Encryption', + 'amount_due' => 'Amount due', + 'billing_address' => 'Adres billingowy (rozliczeniowy)', + 'billing_method' => 'Billing Method', + 'order_overview' => 'Order overview', + 'match_address' => '*Address must match address associated with credit card.', + 'click_once' => '*Please click "PAY NOW" only once - transaction may take up to 1 minute to process.', + 'invoice_footer' => 'Stopka faktury', + 'save_as_default_footer' => 'Save as default footer', + 'token_management' => 'Token Management', + 'tokens' => 'Tokens', + 'add_token' => 'Add Token', + 'show_deleted_tokens' => 'Show deleted tokens', + 'deleted_token' => 'Successfully deleted token', + 'created_token' => 'Successfully created token', + 'updated_token' => 'Successfully updated token', + 'edit_token' => 'Edit Token', + 'delete_token' => 'Delete Token', + 'token' => 'Token', + 'add_gateway' => 'Add Gateway', + 'delete_gateway' => 'Delete Gateway', + 'edit_gateway' => 'Edit Gateway', + 'updated_gateway' => 'Successfully updated gateway', + 'created_gateway' => 'Successfully created gateway', + 'deleted_gateway' => 'Successfully deleted gateway', + 'pay_with_paypal' => 'PayPal', + 'pay_with_card' => 'Credit Card', + 'change_password' => 'Zmień hasło', + 'current_password' => 'Aktualne hasło', + 'new_password' => 'Nowe hasło', + 'confirm_password' => 'Potwierdź hasło', + 'password_error_incorrect' => 'The current password is incorrect.', + 'password_error_invalid' => 'The new password is invalid.', + 'updated_password' => 'Successfully updated password', + 'api_tokens' => 'API Tokens', + 'users_and_tokens' => 'Users & Tokens', + 'account_login' => 'Account Login', + 'recover_password' => 'Recover your password', + 'forgot_password' => 'Forgot your password?', + 'email_address' => 'Email address', + 'lets_go' => 'Let\'s go', + 'password_recovery' => 'Password Recovery', + 'send_email' => 'Wyślij email', + 'set_password' => 'Ustaw hasło', + 'converted' => 'Converted', + 'email_approved' => 'Email me when a quote is approved', + 'notification_quote_approved_subject' => 'Quote :invoice was approved by :client', + 'notification_quote_approved' => 'The following client :client approved Quote :invoice for :amount.', + 'resend_confirmation' => 'Resend confirmation email', + 'confirmation_resent' => 'The confirmation email was resent', + 'gateway_help_42' => ':link to sign up for BitPay.
Note: use a Legacy API Key, not an API token.', + 'payment_type_credit_card' => 'Karta kredytowa', + 'payment_type_paypal' => 'PayPal', + 'payment_type_bitcoin' => 'Bitcoin', + 'knowledge_base' => 'Baza wiedzy', + 'partial' => 'Partial', + 'partial_remaining' => ':partial of :balance', + 'more_fields' => 'More Fields', + 'less_fields' => 'Less Fields', + 'client_name' => 'Nazwa klienta', + 'pdf_settings' => 'Ustawienia PDF', + 'product_settings' => 'Ustawienia produktu', + 'auto_wrap' => 'Auto Line Wrap', + 'duplicate_post' => 'Warning: the previous page was submitted twice. The second submission had been ignored.', + 'view_documentation' => 'View Documentation', + 'app_title' => 'Free Open-Source Online Invoicing', + 'app_description' => 'Invoice Ninja is a free, open-source solution for invoicing and billing customers. With Invoice Ninja, you can easily build and send beautiful invoices from any device that has access to the web. Your clients can print your invoices, download them as pdf files, and even pay you online from within the system.', + 'rows' => 'wierszy', + 'www' => 'www', + 'logo' => 'Logo', + 'subdomain' => 'Subdomain', + 'provide_name_or_email' => 'Proszę podać imię i nazwisko lub adres e-mail', + 'charts_and_reports' => 'Raporty i wykresy', + 'chart' => 'Wykres', + 'report' => 'Raport', + 'group_by' => 'Grupuj według', + 'paid' => 'Zapłacone', + 'enable_report' => 'Raport', + 'enable_chart' => 'Wykres', + 'totals' => 'Suma', + 'run' => 'Run', + 'export' => 'Export', + 'documentation' => 'Documentation', + 'zapier' => 'Zapier', + 'recurring' => 'Okresowe', + 'last_invoice_sent' => 'Last invoice sent :date', + 'processed_updates' => 'Pomyślnie zakończona aktualizacja', + 'tasks' => 'Zadania', + 'new_task' => 'Nowe zadanie', + 'start_time' => 'Czas rozpoczęcia', + 'created_task' => 'Pomyślnie utworzono zadanie', + 'updated_task' => 'Pomyślnie zaktualizowano zadanie', + 'edit_task' => 'Edytuj zadanie', + 'archive_task' => 'Archiwizuj zadanie', + 'restore_task' => 'Przywróć zadanie', + 'delete_task' => 'Usuń zadanie', + 'stop_task' => 'Zatrzymaj zadanie', + 'time' => 'Czas', + 'start' => 'Rozpocznij', + 'stop' => 'Zatrzymaj', + 'now' => 'Teraz', + 'timer' => 'Czasomierz', + 'manual' => 'Manualnie', + 'date_and_time' => 'Data i czas', + 'second' => 'sekunda', + 'seconds' => 'sekund', + 'minute' => 'minuta', + 'minutes' => 'minut', + 'hour' => 'godzina', + 'hours' => 'godzin', + 'task_details' => 'Szczegóły zadania', + 'duration' => 'Czas trwania', + 'end_time' => 'Czas zakończenia', + 'end' => 'Koniec', + 'invoiced' => 'Invoiced', + 'logged' => 'Zalogowany', + 'running' => 'Running', + 'task_error_multiple_clients' => 'The tasks can\'t belong to different clients', + 'task_error_running' => 'Please stop running tasks first', + 'task_error_invoiced' => 'Tasks have already been invoiced', + 'restored_task' => 'Successfully restored task', + 'archived_task' => 'Successfully archived task', + 'archived_tasks' => 'Successfully archived :count tasks', + 'deleted_task' => 'Successfully deleted task', + 'deleted_tasks' => 'Successfully deleted :count tasks', + 'create_task' => 'Create Task', + 'stopped_task' => 'Successfully stopped task', + 'invoice_task' => 'Invoice Task', + 'invoice_labels' => 'Invoice Labels', + 'prefix' => 'Prefix', + 'counter' => 'Counter', + 'payment_type_dwolla' => 'Dwolla', + 'gateway_help_43' => ':link to sign up for Dwolla', + 'partial_value' => 'Must be greater than zero and less than the total', + 'more_actions' => 'More Actions', + 'pro_plan_title' => 'NINJA PRO', + 'pro_plan_call_to_action' => 'Upgrade Now!', + 'pro_plan_feature1' => 'Create Unlimited Clients', + 'pro_plan_feature2' => 'Access to 10 Beautiful Invoice Designs', + 'pro_plan_feature3' => 'Custom URLs - "YourBrand.InvoiceNinja.com"', + 'pro_plan_feature4' => 'Remove "Created by Invoice Ninja"', + 'pro_plan_feature5' => 'Multi-user Access & Activity Tracking', + 'pro_plan_feature6' => 'Create Quotes & Pro-forma Invoices', + 'pro_plan_feature7' => 'Customize Invoice Field Titles & Numbering', + 'pro_plan_feature8' => 'Option to Attach PDFs to Client Emails', + 'resume' => 'Resume', + 'break_duration' => 'Break', + 'edit_details' => 'Edit Details', + 'work' => 'Work', + 'timezone_unset' => 'Please :link to set your timezone', + 'click_here' => 'click here', + 'email_receipt' => 'Wyślij potwierdzenie zapłaty do klienta', + 'created_payment_emailed_client' => 'Successfully created payment and emailed client', + 'add_company' => 'Add Company', + 'untitled' => 'Untitled', + 'new_company' => 'New Company', + 'associated_accounts' => 'Successfully linked accounts', + 'unlinked_account' => 'Successfully unlinked accounts', + 'login' => 'Login', + 'or' => 'or', + 'email_error' => 'There was a problem sending the email', + 'confirm_recurring_timing' => 'Note: emails are sent at the start of the hour.', + 'payment_terms_help' => 'Sets the default invoice due date', + 'unlink_account' => 'Unlink Account', + 'unlink' => 'Unlink', + 'show_address' => 'Show Address', + 'show_address_help' => 'Require client to provide their billing address', + 'update_address' => 'Update Address', + 'update_address_help' => 'Update client\'s address with provided details', + 'times' => 'krotnie', + 'set_now' => 'Ustaw na teraz', + 'dark_mode' => 'Tryb ciemny', + 'dark_mode_help' => 'Show white text on black background', + 'add_to_invoice' => 'Add to invoice :invoice', + 'create_new_invoice' => 'Create new invoice', + 'task_errors' => 'Please correct any overlapping times', + 'from' => 'From', + 'to' => 'To', + 'font_size' => 'Font Size', + 'primary_color' => 'Primary Color', + 'secondary_color' => 'Secondary Color', + 'customize_design' => 'Customize Design', + 'content' => 'Content', + 'styles' => 'Styles', + 'defaults' => 'Defaults', + 'margins' => 'Margins', + 'header' => 'Header', + 'footer' => 'Footer', + 'custom' => 'Custom', + 'invoice_to' => 'Invoice to', + 'invoice_no' => 'Invoice No.', + 'recent_payments' => 'Ostatnie płatności', + 'outstanding' => 'Zaległe', + 'manage_companies' => 'Manage Companies', + 'total_revenue' => 'Całkowity dochód', + 'current_user' => 'Aktualny użytkownik', + 'new_recurring_invoice' => 'Nowa faktura okresowa', + 'recurring_invoice' => 'Okresowa faktura', + 'recurring_too_soon' => 'It\'s too soon to create the next recurring invoice, it\'s scheduled for :date', + 'created_by_invoice' => 'Utworzona przez :invoice', + 'primary_user' => 'Główny Użytkownik', + 'help' => 'Pomoc', + 'customize_help' => '
We use pdfmake to define the invoice designs declaratively. The pdfmake playground provide\'s a great way to see the library in action.
+To access a child property using dot notation. For example to show the client name you could use $client.name.
If you need help figuring something out post a question to our support forum.
', + 'invoice_due_date' => 'Termin', + 'quote_due_date' => 'Valid Until', + 'valid_until' => 'Valid Until', + 'reset_terms' => 'Resetuj warunki', + 'reset_footer' => 'Resetuj stópkę', + 'invoices_sent' => ':count faktura wysłana|:count faktury wysłane', + 'status_draft' => 'Wersja robocza', + 'status_sent' => 'Wysłane', + 'status_viewed' => 'Przeglądnięte', + 'status_partial' => 'Częściowo', + 'status_paid' => 'Zapłacone', + 'show_line_item_tax' => 'Wyświetl podatki pozycji w tej samej linii', + 'iframe_url' => 'Website', + 'iframe_url_help1' => 'Copy the following code to a page on your site.', + 'iframe_url_help2' => 'You can test the feature by clicking \'View as recipient\' for an invoice.', + 'auto_bill' => 'Automatyczny Rachunek', + 'military_time' => '24 godzinny czas', + 'last_sent' => 'Ostatnio wysłany', + 'reminder_emails' => 'Reminder Emails', + 'templates_and_reminders' => 'Szablony i przypomnienia', + 'subject' => 'Temat', + 'body' => 'Treść', + 'first_reminder' => 'Pierwsze przypomnienie', + 'second_reminder' => 'Drugie przypomnienie', + 'third_reminder' => 'Trzecie przypomnienie', + 'num_days_reminder' => 'Dni po terminie', + 'reminder_subject' => 'Reminder: Invoice :invoice from :account', + 'reset' => 'Reset', + 'invoice_not_found' => 'The requested invoice is not available', + 'referral_program' => 'Program referencyjny', + 'referral_code' => 'Referencyjny URL', + 'last_sent_on' => 'Ostatnio wysłany: :date', + 'page_expire' => 'This page will expire soon, :click_here to keep working', + 'upcoming_quotes' => 'Nadchodzące oferty', + 'expired_quotes' => 'Wygaśnięte oferty', + 'sign_up_using' => 'Zarejestruj się przy użyciu', + 'invalid_credentials' => 'These credentials do not match our records', + 'show_all_options' => 'Pokaż wszystkie opcje', + 'user_details' => 'Dane użytkownika', + 'oneclick_login' => 'One-Click Logowanie', + 'disable' => 'Wyłącz', + 'invoice_quote_number' => 'Numery faktur i ofert', + 'invoice_charges' => 'Opłaty faktury', + 'notification_invoice_bounced' => 'We were unable to deliver Invoice :invoice to :contact.', + 'notification_invoice_bounced_subject' => 'Unable to deliver Invoice :invoice', + 'notification_quote_bounced' => 'We were unable to deliver Quote :invoice to :contact.', + 'notification_quote_bounced_subject' => 'Unable to deliver Quote :invoice', + 'custom_invoice_link' => 'Custom Invoice Link', + 'total_invoiced' => 'Total Invoiced', + 'open_balance' => 'Open Balance', + 'verify_email' => 'Please visit the link in the account confirmation email to verify your email address.', + 'basic_settings' => 'Ustawienia podstawowe', + 'pro' => 'Pro', + 'gateways' => 'Payment Gateways', + 'next_send_on' => 'Send Next: :date', + 'no_longer_running' => 'This invoice is not scheduled to run', + 'general_settings' => 'General Settings', + 'customize' => 'Customize', + 'oneclick_login_help' => 'Connect an account to login without a password', + 'referral_code_help' => 'Earn money by sharing our app online', + 'enable_with_stripe' => 'Aktywuj | Wymaga Stripe', + 'tax_settings' => 'Tax Settings', + 'create_tax_rate' => 'Dodaj stawkę podatkową', + 'updated_tax_rate' => 'Successfully updated tax rate', + 'created_tax_rate' => 'Successfully created tax rate', + 'edit_tax_rate' => 'Edit tax rate', + 'archive_tax_rate' => 'Archive Tax Rate', + 'archived_tax_rate' => 'Successfully archived the tax rate', + 'default_tax_rate_id' => 'Domyśłna stawka podatkowa', + 'tax_rate' => 'Stawka podatkowa', + 'recurring_hour' => 'Okresowa godzina', + 'pattern' => 'Pattern', + 'pattern_help_title' => 'Pattern Help', + 'pattern_help_1' => 'Create custom invoice and quote numbers by specifying a pattern', + 'pattern_help_2' => 'Available variables:', + 'pattern_help_3' => 'For example, :example would be converted to :value', + 'see_options' => 'See options', + 'invoice_counter' => 'Invoice Counter', + 'quote_counter' => 'Quote Counter', + 'type' => 'Type', + 'activity_1' => ':user created client :client', + 'activity_2' => ':user archived client :client', + 'activity_3' => ':user deleted client :client', + 'activity_4' => ':user created invoice :invoice', + 'activity_5' => ':user updated invoice :invoice', + 'activity_6' => ':user emailed invoice :invoice to :contact', + 'activity_7' => ':contact viewed invoice :invoice', + 'activity_8' => ':user archived invoice :invoice', + 'activity_9' => ':user deleted invoice :invoice', + 'activity_10' => ':contact entered payment :payment for :invoice', + 'activity_11' => ':user updated payment :payment', + 'activity_12' => ':user archived payment :payment', + 'activity_13' => ':user deleted payment :payment', + 'activity_14' => ':user entered :credit credit', + 'activity_15' => ':user updated :credit credit', + 'activity_16' => ':user archived :credit credit', + 'activity_17' => ':user deleted :credit credit', + 'activity_18' => ':user created quote :quote', + 'activity_19' => ':user updated quote :quote', + 'activity_20' => ':user emailed quote :quote to :contact', + 'activity_21' => ':contact viewed quote :quote', + 'activity_22' => ':user archived quote :quote', + 'activity_23' => ':user deleted quote :quote', + 'activity_24' => ':user restored quote :quote', + 'activity_25' => ':user restored invoice :invoice', + 'activity_26' => ':user restored client :client', + 'activity_27' => ':user restored payment :payment', + 'activity_28' => ':user restored :credit credit', + 'activity_29' => ':contact approved quote :quote', + 'activity_30' => ':user created :vendor', + 'activity_31' => ':user created :vendor', + 'activity_32' => ':user created :vendor', + 'activity_33' => ':user created :vendor', + 'activity_34' => ':user created expense :expense', + 'activity_35' => ':user created :vendor', + 'activity_36' => ':user created :vendor', + 'activity_37' => ':user created :vendor', + 'payment' => 'Payment', + 'system' => 'System', + 'signature' => 'Podpis e-mail', + 'default_messages' => 'Default Messages', + 'quote_terms' => 'Warunki oferty', + 'default_quote_terms' => 'Domyślne warunki oferty', + 'default_invoice_terms' => 'Domyślne warunki faktury', + 'default_invoice_footer' => 'Domyślna stopka faktury', + 'quote_footer' => 'Quote Footer', + 'free' => 'Free', + 'quote_is_approved' => 'This quote is approved', + 'apply_credit' => 'Apply Credit', + 'system_settings' => 'System Settings', + 'archive_token' => 'Archive Token', + 'archived_token' => 'Successfully archived token', + 'archive_user' => 'Archive User', + 'archived_user' => 'Successfully archived user', + 'archive_account_gateway' => 'Archive Gateway', + 'archived_account_gateway' => 'Successfully archived gateway', + 'archive_recurring_invoice' => 'Archiwizuj okresową fakturę', + 'archived_recurring_invoice' => 'Okresowa faktura została zarchiwizowana', + 'delete_recurring_invoice' => 'Usuń okresową fakturę', + 'deleted_recurring_invoice' => 'Okresowa faktura została usunięta.', + 'restore_recurring_invoice' => 'Przywróć okresową fakturę', + 'restored_recurring_invoice' => 'Okresowa faktura została przywrócona', + 'archived' => 'Zarchiwizowany', + 'untitled_account' => 'Firma bez nazwy', + 'before' => 'Przed', + 'after' => 'Po', + 'reset_terms_help' => 'Reset to the default account terms', + 'reset_footer_help' => 'Reset to the default account footer', + 'export_data' => 'Exportuj dane', + 'user' => 'Użytkownik', + 'country' => 'Kraj', + 'include' => 'Include', + 'logo_too_large' => 'Your logo is :size, for better PDF performance we suggest uploading an image file less than 200KB', + 'import_freshbooks' => 'Import From FreshBooks', + 'import_data' => 'Import Data', + 'source' => 'Źródło', + 'csv' => 'CSV', + 'client_file' => 'Plik klienta', + 'invoice_file' => 'Plik faktury', + 'task_file' => 'Plik zadania', + 'no_mapper' => 'No valid mapping for file', + 'invalid_csv_header' => 'Invalid CSV Header', + 'client_portal' => 'Portal klienta', + 'admin' => 'Administrator', + 'disabled' => 'Wyłączony', + 'show_archived_users' => 'Pokaż zarchiwizowanych użytkowników', + 'notes' => 'Notatki', + 'invoice_will_create' => 'client will be created', + 'invoices_will_create' => 'invoices will be created', + 'failed_to_import' => 'The following records failed to import, they either already exist or are missing required fields.', + 'publishable_key' => 'Publishable Key', + 'secret_key' => 'Sekretny klucz', + 'missing_publishable_key' => 'Set your Stripe publishable key for an improved checkout process', + 'email_design' => 'Email Design', + 'due_by' => 'Płatny do :date', + 'enable_email_markup' => 'Enable 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 Style', + 'email_design_help' => 'Make your emails look more professional with HTML layouts', + 'plain' => 'Plain', + 'light' => 'Light', + 'dark' => 'Dark', + 'industry_help' => 'Used to provide comparisons against the averages of companies of similar size and industry.', + 'subdomain_help' => 'Customize the invoice link subdomain or display the invoice on your own website.', + 'invoice_number_help' => 'Specify a prefix or use a custom pattern to dynamically set the invoice number.', + 'quote_number_help' => 'Specify a prefix or use a custom pattern to dynamically set the quote number.', + 'custom_client_fields_helps' => 'Add a field when creating a client and display the label and value on the PDF.', + 'custom_account_fields_helps' => 'Add a label and value to the company details section of the PDF.', + 'custom_invoice_fields_helps' => 'Add a field when creating an invoice and display the label and value on the PDF.', + 'custom_invoice_charges_helps' => 'Add a field when creating an invoice and include the charge in the invoice subtotals.', + 'token_expired' => 'Validation token was expired. Please try again.', + 'invoice_link' => 'Invoice Link', + 'button_confirmation_message' => 'Click to confirm your email address.', + 'confirm' => 'Confirm', + 'email_preferences' => 'Email Preferences', + 'created_invoices' => 'Successfully created :count invoice(s)', + 'next_invoice_number' => 'The next invoice number is :number.', + 'next_quote_number' => 'The next quote number is :number.', + 'days_before' => 'days before', + 'days_after' => 'days after', + 'field_due_date' => 'termin', + 'field_invoice_date' => 'invoice date', + 'schedule' => 'Schedule', + 'email_designs' => 'Email Designs', + 'assigned_when_sent' => 'Assigned when sent', + 'white_label_purchase_link' => 'Purchase a white label license', + 'expense' => 'Wydatek', + 'expenses' => 'Wydatki', + 'new_expense' => 'Nowy wydatek', + 'enter_expense' => 'Dodaj wydatek', + 'vendors' => 'Vendors', + 'new_vendor' => 'New Vendor', + 'payment_terms_net' => 'Net', + 'vendor' => 'Vendor', + 'edit_vendor' => 'Edit Vendor', + 'archive_vendor' => 'Archive Vendor', + 'delete_vendor' => 'Delete Vendor', + 'view_vendor' => 'View Vendor', + 'deleted_expense' => 'Successfully deleted expense', + 'archived_expense' => 'Successfully archived expense', + 'deleted_expenses' => 'Successfully deleted expenses', + 'archived_expenses' => 'Successfully archived expenses', + 'expense_amount' => 'Expense Amount', + 'expense_balance' => 'Expense Balance', + 'expense_date' => 'Expense Date', + 'expense_should_be_invoiced' => 'Should this expense be invoiced?', + 'public_notes' => 'Public Notes', + 'invoice_amount' => 'Invoice Amount', + 'exchange_rate' => 'Exchange Rate', + 'yes' => 'Yes', + 'no' => 'No', + 'should_be_invoiced' => 'Should be invoiced', + 'view_expense' => 'View expense # :expense', + 'edit_expense' => 'Edit Expense', + 'archive_expense' => 'Archive Expense', + 'delete_expense' => 'Delete Expense', + 'view_expense_num' => 'Expense # :expense', + 'updated_expense' => 'Successfully updated expense', + 'created_expense' => 'Successfully created expense', + 'enter_expense' => 'Dodaj wydatek', + 'view' => 'View', + 'restore_expense' => 'Przywróć wydatek', + 'invoice_expense' => 'Faktura na wydatek', + 'expense_error_multiple_clients' => 'The expenses can\'t belong to different clients', + 'expense_error_invoiced' => 'Expense has already been invoiced', + 'convert_currency' => 'Konwersja waluty', + 'num_days' => 'Liczba dni', + 'create_payment_term' => 'Utwórz warunki płatności', + 'edit_payment_terms' => 'Edytuj warunki płatności', + 'edit_payment_term' => 'Edytuj warunki płatności', + 'archive_payment_term' => 'Zarchiwizuj warunki płatności', + 'recurring_due_dates' => 'Terminy faktur okresowych', + 'recurring_due_date_help' => 'Automatycznie ustawia termin faktury.
+Invoices on a monthly or yearly cycle set to be due on or before the day they are created will be due the next month. Invoices set to be due on the 29th or 30th in months that don\'t have that day will be due the last day of the month.
+Invoices on a weekly cycle set to be due on the day of the week they are created will be due the next week.
+For example:
+-
+
- Today is the 15th, due date is 1st of the month. The due date should likely be the 1st of the next month. +
- Today is the 15th, due date is the last day of the month. The due date will be the last day of the this month. + +
- Today is the 15th, due date is the 15th day of the month. The due date will be the 15th day of next month. + +
- Today is the Friday, due date is the 1st Friday after. The due date will be next Friday, not today. + +
Automatically sets a due date for the invoice.
-Invoices on a monthly or yearly cycle set to be due on or before the day they are created will be due the next month. Invoices set to be due on the 29th or 30th in months that don\'t have that day will be due the last day of the month.
-Invoices on a weekly cycle set to be due on the day of the week they are created will be due the next week.
-For example:
+ 'recurring_due_dates' => 'Data de Vencimento das Faturas Recorrentes', + 'recurring_due_date_help' => 'Definir automaticamente a data de vencimento da fatura.
+Faturas em um ciclo mensal ou anual com vencimento anterior ou na data em que são criadas serão faturadas para o próximo mês. Faturas com vencimento no dia 29 ou 30 nos meses que não tem esse dia será faturada no último dia do mês..
+Faturas em um clclo mensal com vencimento no dia da semana em que foi criada serão faturadas para a próxima semana.
+Exemplo:
-
-
- Today is the 15th, due date is 1st of the month. The due date should likely be the 1st of the next month. -
- Today is the 15th, due date is the last day of the month. The due date will be the last day of the this month. - -
- Today is the 15th, due date is the 15th day of the month. The due date will be the 15th day of next month. - -
- Today is the Friday, due date is the 1st Friday after. The due date will be next Friday, not today. - +
- Hoje é dia 15, vencimento no primeiro dia do mês. O Vencimento será no primeiro dia do próximo mês. +
- Hoje é dia 15, vencimento no último dia do mês. O Vencimento será no último dia do mês corrente +
- Hoje é dia 15, vencimento no dia 15. O venciemnto será no dia 15 do próximo mês. +
- Hoje é Sexta-Feira, vencimento na primeira sexta-feira. O venciemnto será na próxima sexta-feira, não hoje.
@@ -63,7 +63,7 @@
@foreach ($gateway->fields as $field => $details)
- @if ($details && !$accountGateway)
+ @if ($details && !$accountGateway && !is_array($details))
{!! Former::populateField($gateway->id.'_'.$field, $details) !!}
@endif
diff --git a/resources/views/accounts/api_tokens.blade.php b/resources/views/accounts/api_tokens.blade.php
index 0b338c80268a..49029bf8d2b3 100644
--- a/resources/views/accounts/api_tokens.blade.php
+++ b/resources/views/accounts/api_tokens.blade.php
@@ -6,10 +6,10 @@
{!! trans('texts.white_label_custom_css', ['link'=>''.trans('texts.white_label_purchase_link').'']) !!}
@@ -39,6 +40,11 @@
->text(trans('texts.enable'))
->help(trans('texts.enable_client_portal_help')) !!}
+
+ @if (Utils::hasFeature(FEATURE_CLIENT_PORTAL_CSS))
{!! Button::normal(trans('texts.documentation'))->asLinkTo(NINJA_WEB_URL.'/api-documentation/')->withAttributes(['target' => '_blank'])->appendIcon(Icon::create('info-sign')) !!}
- @if (Utils::isNinja())
+ @if (Utils::isNinja() && !Utils::isReseller())
{!! Button::normal(trans('texts.zapier'))->asLinkTo(ZAPIER_URL)->withAttributes(['target' => '_blank']) !!}
@endif
- @if (Utils::isPro())
+ @if (Utils::hasFeature(FEATURE_API))
{!! Button::primary(trans('texts.add_token'))->asLinkTo(URL::to('/tokens/create'))->appendIcon(Icon::create('plus-sign')) !!}
@endif
diff --git a/resources/views/accounts/client_portal.blade.php b/resources/views/accounts/client_portal.blade.php
index 8737c015d06e..710858ae9817 100644
--- a/resources/views/accounts/client_portal.blade.php
+++ b/resources/views/accounts/client_portal.blade.php
@@ -13,11 +13,12 @@
->addClass('warn-on-exit') !!}
{!! Former::populateField('enable_client_portal', intval($account->enable_client_portal)) !!}
+{!! Former::populateField('enable_client_portal_dashboard', intval($account->enable_client_portal_dashboard)) !!}
{!! Former::populateField('client_view_css', $client_view_css) !!}
{!! Former::populateField('enable_portal_password', intval($enable_portal_password)) !!}
{!! Former::populateField('send_portal_password', intval($send_portal_password)) !!}
-@if (!Utils::isNinja() && !Auth::user()->account->isWhiteLabel())
+@if (!Utils::isNinja() && !Auth::user()->account->hasFeature(FEATURE_WHITE_LABEL))
+ {!! Former::checkbox('enable_client_portal_dashboard')
+ ->text(trans('texts.enable'))
+ ->help(trans('texts.enable_client_portal_dashboard_help')) !!}
+
{!! Former::checkbox('enable_portal_password')
->text(trans('texts.enable_portal_password'))
@@ -53,6 +59,7 @@
{!! trans('texts.custom_css') !!}
@@ -68,6 +75,7 @@ ->style("min-width:100%;max-width:100%;font-family:'Roboto Mono', 'Lucida Console', Monaco, monospace;font-size:14px;'") !!}
-
diff --git a/resources/views/accounts/templates_and_reminders.blade.php b/resources/views/accounts/templates_and_reminders.blade.php
index 22a3a8a4a08c..87453e80dae6 100644
--- a/resources/views/accounts/templates_and_reminders.blade.php
+++ b/resources/views/accounts/templates_and_reminders.blade.php
@@ -25,11 +25,16 @@
{!! Former::vertical_open()->addClass('warn-on-exit') !!}
- {!! Former::populate($account) !!}
@foreach ([ENTITY_INVOICE, ENTITY_QUOTE, ENTITY_PAYMENT, REMINDER1, REMINDER2, REMINDER3] as $type)
@foreach (['subject', 'template'] as $field)
- {!! Former::populateField("email_{$field}_{$type}", $templates[$type][$field]) !!}
+ {{ Former::populateField("email_{$field}_{$type}", $templates[$type][$field]) }}
+ @endforeach
+ @endforeach
+
+ @foreach ([REMINDER1, REMINDER2, REMINDER3] as $type)
+ @foreach (['enable', 'num_days', 'direction', 'field'] as $field)
+ {{ Former::populateField("{$field}_{$type}", $account->{"{$field}_{$type}"}) }}
@endforeach
@endforeach
@@ -80,6 +85,26 @@
+
+
+
- @if (Auth::user()->isPro())
+ @if (Auth::user()->hasFeature(FEATURE_API))
{!! Former::actions(
Button::normal(trans('texts.cancel'))->asLinkTo(URL::to('/settings/api_tokens'))->appendIcon(Icon::create('remove-circle'))->large(),
Button::success(trans('texts.save'))->submit()->large()->appendIcon(Icon::create('floppy-disk'))
diff --git a/resources/views/accounts/user_management.blade.php b/resources/views/accounts/user_management.blade.php
index a7f70f925b7a..5d8f8cf07e5e 100644
--- a/resources/views/accounts/user_management.blade.php
+++ b/resources/views/accounts/user_management.blade.php
@@ -4,13 +4,13 @@
@parent
@include('accounts.nav', ['selected' => ACCOUNT_USER_MANAGEMENT, 'advanced' => true])
-
-
-
+
@include('partials/quill_toolbar', ['name' => $field])
+
+ {!! Button::primary(trans('texts.preview'))->withAttributes(['onclick' => 'serverPreview("'.$field.'")'])->small() !!}
+
- @if (Utils::isPro() && ! Utils::isTrial())
- {!! Button::primary(trans('texts.add_user'))->asLinkTo(URL::to('/users/create'))->appendIcon(Icon::create('plus-sign')) !!}
+ @if (Utils::hasFeature(FEATURE_USERS))
+
-
+ {!! Button::primary(trans('texts.add_user'))->asLinkTo(URL::to('/users/create'))->appendIcon(Icon::create('plus-sign')) !!}
+
+ @elseif (Utils::isTrial())
+ {!! trans('texts.add_users_not_supported') !!}
@endif
-