\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+='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', @@ -736,8 +736,8 @@ return array( 'total_revenue' => 'Total Revenue', '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', @@ -785,15 +785,15 @@ return array( 'page_expire' => 'This page will expire soon, :click_here to keep working', 'upcoming_quotes' => 'Upcoming Quotes', - 'expired_quotes' => 'Expired Quotes', + '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', @@ -845,8 +845,8 @@ return array( '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_4' => ':user ha creato la fattura :invoice', + 'activity_5' => ':user ha aggiornato la fattura :invoice', 'activity_6' => ':user emailed invoice :invoice to :contact', 'activity_7' => ':contact viewed invoice :invoice', 'activity_8' => ':user archived invoice :invoice', @@ -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', @@ -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', @@ -1126,4 +1126,73 @@ return array( 'overdue' => 'Overdue', 'white_label_text' => 'Purchase a ONE YEAR white label license for $'.WHITE_LABEL_PRICE.' to remove the Invoice Ninja branding from the client portal and help support our project.', -); \ No newline at end of file + 'navigation' => 'Navigation', + 'list_invoices' => 'List Invoices', + 'list_clients' => 'List Clients', + 'list_quotes' => 'List Quotes', + 'list_tasks' => 'List Tasks', + 'list_expenses' => 'List Expenses', + 'list_recurring_invoices' => 'List Recurring Invoices', + 'list_payments' => 'List Payments', + 'list_credits' => 'List Credits', + 'tax_name' => 'Tax Name', + 'report_settings' => 'Report Settings', + 'search_hotkey' => 'shortcut is /', + + 'new_user' => 'New User', + 'new_product' => 'New Product', + 'new_tax_rate' => 'New Tax Rate', + 'invoiced_amount' => 'Invoiced Amount', + 'invoice_item_fields' => 'Invoice Item Fields', + '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', + 'enable_portal_password_help'=>'Allows you to set a password for each contact. If a password is set, the contact will be required to enter a password before viewing invoices.', + 'send_portal_password'=>'Generate password automatically', + 'send_portal_password_help'=>'If no password is set, one will be generated and sent with the first invoice.', + + 'expired' => 'Expired', + 'invalid_card_number' => 'The credit card number is not valid.', + 'invalid_expiry' => 'The expiration date is not valid.', + 'invalid_cvv' => 'The CVV is not valid.', + 'cost' => 'Cost', + 'create_invoice_for_sample' => 'Note: create your first invoice to see a preview here.', + + // User Permissions + 'owner' => 'Owner', + 'administrator' => 'Administrator', + 'administrator_help' => 'Allow user to manage users, change settings and modify all records', + 'user_create_all' => 'Create clients, invoices, etc.', + 'user_view_all' => 'View all clients, invoices, etc.', + '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' => 'Da versare (parziale)', + 'restore_vendor' => 'Restore Vendor', + 'restored_vendor' => 'Successfully restored vendor', + 'restored_expense' => 'Successfully restored expense', + 'permissions' => 'Permissions', + 'create_all_help' => 'Allow user to create and modify records', + 'view_all_help' => 'Allow user to view records they didn\'t create', + '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', + +); diff --git a/resources/lang/ja/texts.php b/resources/lang/ja/texts.php index a6b046e42f46..7e673ac11d33 100644 --- a/resources/lang/ja/texts.php +++ b/resources/lang/ja/texts.php @@ -1051,6 +1051,51 @@ $LANG = array( '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' => 'ダッシュボード', 'enable_client_portal_help' => 'Show/hide the dashboard page in the client portal.', + + // Client Passwords + 'enable_portal_password'=>'Password protect invoices', + 'enable_portal_password_help'=>'Allows you to set a password for each contact. If a password is set, the contact will be required to enter a password before viewing invoices.', + 'send_portal_password'=>'Generate password automatically', + 'send_portal_password_help'=>'If no password is set, one will be generated and sent with the first invoice.', + + 'expired' => 'Expired', + 'invalid_card_number' => 'The credit card number is not valid.', + 'invalid_expiry' => 'The expiration date is not valid.', + 'invalid_cvv' => 'The CVV is not valid.', + 'cost' => 'Cost', + 'create_invoice_for_sample' => 'Note: create your first invoice to see a preview here.', + + // User Permissions + 'owner' => 'Owner', + 'administrator' => 'Administrator', + 'administrator_help' => 'Allow user to manage users, change settings and modify all records', + 'user_create_all' => 'Create clients, invoices, etc.', + 'user_view_all' => 'View all clients, invoices, etc.', + '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', + 'restore_vendor' => 'Restore Vendor', + 'restored_vendor' => 'Successfully restored vendor', + 'restored_expense' => 'Successfully restored expense', + 'permissions' => 'Permissions', + 'create_all_help' => 'Allow user to create and modify records', + 'view_all_help' => 'Allow user to view records they didn\'t create', + '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', ); diff --git a/resources/lang/lt/texts.php b/resources/lang/lt/texts.php index 584f7776b435..252a7f03bd9c 100644 --- a/resources/lang/lt/texts.php +++ b/resources/lang/lt/texts.php @@ -1133,4 +1133,73 @@ return array( 'overdue' => 'Overdue', 'white_label_text' => 'Purchase a ONE YEAR white label license for $'.WHITE_LABEL_PRICE.' to remove the Invoice Ninja branding from the client portal and help support our project.', + 'navigation' => 'Navigation', + 'list_invoices' => 'List Invoices', + 'list_clients' => 'List Clients', + 'list_quotes' => 'List Quotes', + 'list_tasks' => 'List Tasks', + 'list_expenses' => 'List Expenses', + 'list_recurring_invoices' => 'List Recurring Invoices', + 'list_payments' => 'List Payments', + 'list_credits' => 'List Credits', + 'tax_name' => 'Tax Name', + 'report_settings' => 'Report Settings', + 'search_hotkey' => 'shortcut is /', + + 'new_user' => 'New User', + 'new_product' => 'New Product', + 'new_tax_rate' => 'New Tax Rate', + 'invoiced_amount' => 'Invoiced Amount', + 'invoice_item_fields' => 'Invoice Item Fields', + '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', + 'enable_portal_password_help'=>'Allows you to set a password for each contact. If a password is set, the contact will be required to enter a password before viewing invoices.', + 'send_portal_password'=>'Generate password automatically', + 'send_portal_password_help'=>'If no password is set, one will be generated and sent with the first invoice.', + + 'expired' => 'Expired', + 'invalid_card_number' => 'The credit card number is not valid.', + 'invalid_expiry' => 'The expiration date is not valid.', + 'invalid_cvv' => 'The CVV is not valid.', + 'cost' => 'Cost', + 'create_invoice_for_sample' => 'Note: create your first invoice to see a preview here.', + + // User Permissions + 'owner' => 'Owner', + 'administrator' => 'Administrator', + 'administrator_help' => 'Allow user to manage users, change settings and modify all records', + 'user_create_all' => 'Create clients, invoices, etc.', + 'user_view_all' => 'View all clients, invoices, etc.', + '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', + 'restore_vendor' => 'Restore Vendor', + 'restored_vendor' => 'Successfully restored vendor', + 'restored_expense' => 'Successfully restored expense', + 'permissions' => 'Permissions', + 'create_all_help' => 'Allow user to create and modify records', + 'view_all_help' => 'Allow user to view records they didn\'t create', + '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', + ); \ No newline at end of file diff --git a/resources/lang/nb_NO/texts.php b/resources/lang/nb_NO/texts.php index afc916a5def3..df06d7a32547 100644 --- a/resources/lang/nb_NO/texts.php +++ b/resources/lang/nb_NO/texts.php @@ -1131,4 +1131,73 @@ return array( 'overdue' => 'Overdue', 'white_label_text' => 'Purchase a ONE YEAR white label license for $'.WHITE_LABEL_PRICE.' to remove the Invoice Ninja branding from the client portal and help support our project.', + 'navigation' => 'Navigation', + 'list_invoices' => 'List Invoices', + 'list_clients' => 'List Clients', + 'list_quotes' => 'List Quotes', + 'list_tasks' => 'List Tasks', + 'list_expenses' => 'List Expenses', + 'list_recurring_invoices' => 'List Recurring Invoices', + 'list_payments' => 'List Payments', + 'list_credits' => 'List Credits', + 'tax_name' => 'Tax Name', + 'report_settings' => 'Report Settings', + 'search_hotkey' => 'shortcut is /', + + 'new_user' => 'New User', + 'new_product' => 'New Product', + 'new_tax_rate' => 'New Tax Rate', + 'invoiced_amount' => 'Invoiced Amount', + 'invoice_item_fields' => 'Invoice Item Fields', + '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', + 'enable_portal_password_help'=>'Allows you to set a password for each contact. If a password is set, the contact will be required to enter a password before viewing invoices.', + 'send_portal_password'=>'Generate password automatically', + 'send_portal_password_help'=>'If no password is set, one will be generated and sent with the first invoice.', + + 'expired' => 'Expired', + 'invalid_card_number' => 'The credit card number is not valid.', + 'invalid_expiry' => 'The expiration date is not valid.', + 'invalid_cvv' => 'The CVV is not valid.', + 'cost' => 'Cost', + 'create_invoice_for_sample' => 'Note: create your first invoice to see a preview here.', + + // User Permissions + 'owner' => 'Owner', + 'administrator' => 'Administrator', + 'administrator_help' => 'Allow user to manage users, change settings and modify all records', + 'user_create_all' => 'Create clients, invoices, etc.', + 'user_view_all' => 'View all clients, invoices, etc.', + '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', + 'restore_vendor' => 'Restore Vendor', + 'restored_vendor' => 'Successfully restored vendor', + 'restored_expense' => 'Successfully restored expense', + 'permissions' => 'Permissions', + 'create_all_help' => 'Allow user to create and modify records', + 'view_all_help' => 'Allow user to view records they didn\'t create', + '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', + ); \ No newline at end of file diff --git a/resources/lang/nl/texts.php b/resources/lang/nl/texts.php index db06a981f4f1..26c639245bb9 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', @@ -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,220 +910,286 @@ 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.
@@ -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 4612b1cbfedd..0b338c80268a 100644
--- a/resources/views/accounts/api_tokens.blade.php
+++ b/resources/views/accounts/api_tokens.blade.php
@@ -5,7 +5,7 @@
@include('accounts.nav', ['selected' => ACCOUNT_API_TOKENS, 'advanced' => true])
- {!! Button::normal(trans('texts.documentation'))->asLinkTo(NINJA_WEB_URL.'/knowledgebase/api-documentation/')->withAttributes(['target' => '_blank'])->appendIcon(Icon::create('info-sign')) !!}
+ {!! Button::normal(trans('texts.documentation'))->asLinkTo(NINJA_WEB_URL.'/api-documentation/')->withAttributes(['target' => '_blank'])->appendIcon(Icon::create('info-sign')) !!}
@if (Utils::isNinja())
{!! Button::normal(trans('texts.zapier'))->asLinkTo(ZAPIER_URL)->withAttributes(['target' => '_blank']) !!}
@endif
@@ -51,4 +51,9 @@
+ @if (Utils::isNinja() && !Utils::isReseller())
+
+ + @endif + @stop diff --git a/resources/views/accounts/client_portal.blade.php b/resources/views/accounts/client_portal.blade.php index 745574ad7254..8c4171b0f7a2 100644 --- a/resources/views/accounts/client_portal.blade.php +++ b/resources/views/accounts/client_portal.blade.php @@ -13,6 +13,7 @@ ->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)) !!} @@ -28,45 +29,52 @@ @include('accounts.nav', ['selected' => ACCOUNT_CLIENT_PORTAL])
-
diff --git a/resources/views/accounts/localization.blade.php b/resources/views/accounts/localization.blade.php
index f2c28e3684a8..b921c8710567 100644
--- a/resources/views/accounts/localization.blade.php
+++ b/resources/views/accounts/localization.blade.php
@@ -11,26 +11,29 @@
@include('accounts.nav', ['selected' => ACCOUNT_LOCALIZATION])
-
-
-
- {!! trans('texts.client_portal') !!}
-
-
-
- {!! Former::checkbox('enable_client_portal')
- ->text(trans('texts.enable'))
- ->help(trans('texts.enable_client_portal_help')) !!}
-
-
- {!! Former::checkbox('enable_portal_password')
- ->text(trans('texts.enable_portal_password'))
- ->help(trans('texts.enable_portal_password_help'))
- ->label(' ') !!}
-
-
- {!! Former::checkbox('send_portal_password')
- ->text(trans('texts.send_portal_password'))
- ->help(trans('texts.send_portal_password_help'))
- ->label(' ') !!}
-
-
-
diff --git a/resources/views/accounts/details.blade.php b/resources/views/accounts/details.blade.php
index 56dc8f33e73c..7601ff4eb34b 100644
--- a/resources/views/accounts/details.blade.php
+++ b/resources/views/accounts/details.blade.php
@@ -51,8 +51,8 @@
-
- {!! trans('texts.custom_css') !!}
-
-
+
- {!! Former::textarea('client_view_css')
- ->label(trans('texts.custom_css'))
- ->rows(10)
- ->raw()
- ->autofocus()
- ->maxlength(60000)
- ->style("min-width:100%;max-width:100%;font-family:'Roboto Mono', 'Lucida Console', Monaco, monospace;font-size:14px;'") !!}
-
-
+
+
+
+
+ {!! trans('texts.client_portal') !!}
+
+
+
+ {!! Former::checkbox('enable_client_portal')
+ ->text(trans('texts.enable'))
+ ->help(trans('texts.enable_client_portal_help')) !!}
+
+
+ {!! 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'))
+ ->help(trans('texts.enable_portal_password_help'))
+ ->label(' ') !!}
+
+
+ {!! Former::checkbox('send_portal_password')
+ ->text(trans('texts.send_portal_password'))
+ ->help(trans('texts.send_portal_password_help'))
+ ->label(' ') !!}
+
+
+
+
+ {!! trans('texts.custom_css') !!}
+
+
+
+ {!! Former::textarea('client_view_css')
+ ->label(trans('texts.custom_css'))
+ ->rows(10)
+ ->raw()
+ ->autofocus()
+ ->maxlength(60000)
+ ->style("min-width:100%;max-width:100%;font-family:'Roboto Mono', 'Lucida Console', Monaco, monospace;font-size:14px;'") !!}
+
+
-
- {!! HTML::image($account->getLogoPath().'?no_cache='.time(), 'Logo', ['max-width' => 200]) !!}
+
+ {!! HTML::image($account->getLogoUrl(true), 'Logo', ['style' => 'max-width:300px']) !!}
{{ trans('texts.remove_logo') }}
diff --git a/resources/views/accounts/email_settings.blade.php b/resources/views/accounts/email_settings.blade.php
index e6b7e291a04f..3109b160d7be 100644
--- a/resources/views/accounts/email_settings.blade.php
+++ b/resources/views/accounts/email_settings.blade.php
@@ -19,6 +19,7 @@
])->addClass('warn-on-exit') !!}
{{ Former::populate($account) }}
{{ Former::populateField('pdf_email_attachment', intval($account->pdf_email_attachment)) }}
+ {{ Former::populateField('document_email_attachment', intval($account->document_email_attachment)) }}
{{ Former::populateField('enable_email_markup', intval($account->enable_email_markup)) }}
@@ -27,6 +28,7 @@
{!! Former::checkbox('pdf_email_attachment')->text(trans('texts.enable')) !!}
+ {!! Former::checkbox('document_email_attachment')->text(trans('texts.enable')) !!}
@@ -50,7 +52,7 @@
->help(trans('texts.subdomain_help')) !!}
{!! Former::text('iframe_url')
- ->placeholder('http://www.example.com/invoice')
+ ->placeholder('https://www.example.com/invoice')
->appendIcon('question-sign')
->addGroupClass('iframe_url')
->label(' ')
diff --git a/resources/views/accounts/invoice_design.blade.php b/resources/views/accounts/invoice_design.blade.php
index 4af173818dad..9576afbf1d92 100644
--- a/resources/views/accounts/invoice_design.blade.php
+++ b/resources/views/accounts/invoice_design.blade.php
@@ -48,6 +48,7 @@
function getPDFString(cb) {
invoice.is_pro = {!! Auth::user()->isPro() ? 'true' : 'false' !!};
invoice.account.hide_quantity = $('#hide_quantity').is(":checked");
+ invoice.account.invoice_embed_documents = $('#invoice_embed_documents').is(":checked");
invoice.account.hide_paid_to_date = $('#hide_paid_to_date').is(":checked");
invoice.invoice_design_id = $('#invoice_design_id').val();
@@ -207,6 +208,7 @@
{!! Former::checkbox('hide_quantity')->text(trans('texts.hide_quantity_help')) !!}
{!! Former::checkbox('hide_paid_to_date')->text(trans('texts.hide_paid_to_date_help')) !!}
+ {!! Former::checkbox('invoice_embed_documents')->text(trans('texts.invoice_embed_documents_help')) !!}
+
+
-
diff --git a/resources/views/accounts/templates_and_reminders.blade.php b/resources/views/accounts/templates_and_reminders.blade.php
index 22a3a8a4a08c..7bf6638167d6 100644
--- a/resources/views/accounts/templates_and_reminders.blade.php
+++ b/resources/views/accounts/templates_and_reminders.blade.php
@@ -201,6 +201,13 @@
var keys = {!! json_encode(\App\Ninja\Mailers\ContactMailer::$variableFields) !!};
var passwordHtml = "{!! $account->isPro() && $account->enable_portal_password && $account->send_portal_password?'
@@ -122,6 +143,7 @@
{!! Former::close() !!}
@stop
\ No newline at end of file
diff --git a/resources/views/header.blade.php b/resources/views/header.blade.php
index 3ce364da6441..40b499fe8848 100644
--- a/resources/views/header.blade.php
+++ b/resources/views/header.blade.php
@@ -275,6 +275,7 @@
@if (Auth::check() && Auth::user()->account->custom_client_label1)
,{
name: 'data',
+ limit: 3,
display: 'value',
source: searchData(data['{{ Auth::user()->account->custom_client_label1 }}'], 'tokens'),
templates: {
@@ -285,6 +286,7 @@
@if (Auth::check() && Auth::user()->account->custom_client_label2)
,{
name: 'data',
+ limit: 3,
display: 'value',
source: searchData(data['{{ Auth::user()->account->custom_client_label2 }}'], 'tokens'),
templates: {
@@ -295,6 +297,7 @@
@foreach (['clients', 'contacts', 'invoices', 'quotes', 'navigation'] as $type)
,{
name: 'data',
+ limit: 3,
display: 'value',
source: searchData(data['{{ $type }}'], 'tokens', true),
templates: {
@@ -448,7 +451,7 @@
'user_id' => $item->user_id,
'account_name' => $item->account_name,
'user_name' => $item->user_name,
- 'logo_path' => isset($item->logo_path) ? $item->logo_path : "",
+ 'logo_url' => isset($item->logo_url) ? $item->logo_url : "",
'selected' => true,
])
@endif
@@ -460,7 +463,7 @@
'user_id' => $item->user_id,
'account_name' => $item->account_name,
'user_name' => $item->user_name,
- 'logo_path' => isset($item->logo_path) ? $item->logo_path : "",
+ 'logo_url' => isset($item->logo_url) ? $item->logo_url : "",
'selected' => false,
])
@endif
@@ -469,7 +472,7 @@
@include('user_account', [
'account_name' => Auth::user()->account->name ?: trans('texts.untitled'),
'user_name' => Auth::user()->getDisplayName(),
- 'logo_path' => Auth::user()->account->getLogoPath(),
+ 'logo_url' => Auth::user()->account->getLogoURL(),
'selected' => true,
])
@endif
diff --git a/resources/views/invited/dashboard.blade.php b/resources/views/invited/dashboard.blade.php
index a5b698c46e2e..4af2cc53c9d3 100644
--- a/resources/views/invited/dashboard.blade.php
+++ b/resources/views/invited/dashboard.blade.php
@@ -95,7 +95,7 @@
-
diff --git a/resources/views/accounts/system_settings.blade.php b/resources/views/accounts/system_settings.blade.php
index 31be6a9d0962..ce889364f943 100644
--- a/resources/views/accounts/system_settings.blade.php
+++ b/resources/views/accounts/system_settings.blade.php
@@ -6,22 +6,23 @@
@include('accounts.nav', ['selected' => ACCOUNT_SYSTEM_SETTINGS])
-
- {!! trans('texts.localization') !!}
-
+
+
+
+ {!! trans('texts.localization') !!}
+
- {!! Former::select('currency_id')->addOption('','')
- ->fromQuery($currencies, 'name', 'id') !!}
- {!! Former::select('language_id')->addOption('','')
- ->fromQuery($languages, 'name', 'id') !!}
- {!! Former::select('timezone_id')->addOption('','')
- ->fromQuery($timezones, 'location', 'id') !!}
- {!! Former::select('date_format_id')->addOption('','')
- ->fromQuery($dateFormats, 'label', 'id') !!}
- {!! Former::select('datetime_format_id')->addOption('','')
- ->fromQuery($datetimeFormats, 'label', 'id') !!}
- {!! Former::checkbox('military_time')->text(trans('texts.enable')) !!}
- {{-- Former::checkbox('show_currency_code')->text(trans('texts.enable')) --}}
+ {!! Former::select('currency_id')->addOption('','')
+ ->fromQuery($currencies, 'name', 'id') !!}
+ {!! Former::select('language_id')->addOption('','')
+ ->fromQuery($languages, 'name', 'id') !!}
+ {!! Former::select('timezone_id')->addOption('','')
+ ->fromQuery($timezones, 'location', 'id') !!}
+ {!! Former::select('date_format_id')->addOption('','')
+ ->fromQuery($dateFormats, 'label', 'id') !!}
+ {!! Former::select('datetime_format_id')->addOption('','')
+ ->fromQuery($datetimeFormats, 'label', 'id') !!}
+ {!! Former::checkbox('military_time')->text(trans('texts.enable')) !!}
+ {{-- Former::checkbox('show_currency_code')->text(trans('texts.enable')) --}}
+
-
- {!! Former::open('/update_setup')
- ->addClass('warn-on-exit')
- ->autocomplete('off')
- ->rules([
- 'app[url]' => 'required',
- //'database[default]' => 'required',
- 'database[type][host]' => 'required',
- 'database[type][database]' => 'required',
- 'database[type][username]' => 'required',
- 'database[type][password]' => 'required',
- ]) !!}
+
+ {!! Former::open('/update_setup')
+ ->addClass('warn-on-exit')
+ ->autocomplete('off')
+ ->rules([
+ 'app[url]' => 'required',
+ //'database[default]' => 'required',
+ 'database[type][host]' => 'required',
+ 'database[type][database]' => 'required',
+ 'database[type][username]' => 'required',
+ 'database[type][password]' => 'required',
+ ]) !!}
- @include('partials.system_settings')
+ @include('partials.system_settings')
+
'.trans('texts.password').': 6h2NWNdw6
':'' !!}"; + + @if ($account->isPro()) + var documentsHtml = "{!! trans('texts.email_documents_header').'
' !!}"; + @else + var documentsHtml = ""; + @endif + var vals = [ {!! json_encode($emailFooter) !!}, "{{ $account->getDisplayName() }}", @@ -213,6 +220,7 @@ "0001", "0001", passwordHtml, + documentsHtml, "{{ URL::to('/view/...') }}$password", '{!! Form::flatButton('view_invoice', '#0b4d78') !!}$password', "{{ URL::to('/payment/...') }}$password", diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index fe275fe1d54f..b51734c80a9a 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -105,7 +105,7 @@ @endif- {!! link_to('/forgot', trans('texts.forgot_password')) !!} + {!! link_to('/recover_password', trans('texts.recover_password')) !!} {!! link_to(NINJA_WEB_URL.'/knowledgebase/', trans('texts.knowledge_base'), ['target' => '_blank', 'class' => 'pull-right']) !!}
diff --git a/resources/views/auth/password.blade.php b/resources/views/auth/password.blade.php index 0cb2596e78a4..50436beab357 100644 --- a/resources/views/auth/password.blade.php +++ b/resources/views/auth/password.blade.php @@ -53,7 +53,7 @@ @section('body')
-{!! Former::open('forgot')->rules(['email' => 'required|email'])->addClass('form-signin') !!}
+{!! Former::open('recover_password')->rules(['email' => 'required|email'])->addClass('form-signin') !!}
 }})
diff --git a/resources/views/clientauth/login.blade.php b/resources/views/clientauth/login.blade.php
index 0469e882b092..6ad28a593831 100644
--- a/resources/views/clientauth/login.blade.php
+++ b/resources/views/clientauth/login.blade.php
@@ -89,7 +89,7 @@
->large()->submit()->block() !!}
Invoice Ninja | {{ trans('texts.password_recovery') }}
- {!! link_to('/client/forgot', trans('texts.forgot_password')) !!} + {!! link_to('/client/recover_password', trans('texts.recover_password')) !!}
diff --git a/resources/views/clientauth/password.blade.php b/resources/views/clientauth/password.blade.php index 7216765b4d04..79fc36a9a775 100644 --- a/resources/views/clientauth/password.blade.php +++ b/resources/views/clientauth/password.blade.php @@ -52,7 +52,7 @@ @section('body')
-{!! Former::open('client/forgot')->addClass('form-signin') !!}
+{!! Former::open('client/recover_password')->addClass('form-signin') !!}
+ @if ($account->isPro())
+
+ @endif
@if (!isset($hideLogo) || !$hideLogo)
diff --git a/resources/views/clients/show.blade.php b/resources/views/clients/show.blade.php
index 3166f9b800da..4af8e7a58f20 100644
--- a/resources/views/clients/show.blade.php
+++ b/resources/views/clients/show.blade.php
@@ -14,7 +14,7 @@
}
-
+
@endif
@stop
diff --git a/resources/views/emails/partials/account_logo.blade.php b/resources/views/emails/partials/account_logo.blade.php
index cfe158153fe7..d79002d6b938 100644
--- a/resources/views/emails/partials/account_logo.blade.php
+++ b/resources/views/emails/partials/account_logo.blade.php
@@ -3,7 +3,7 @@
@endif
- ) }})
+ ) }})
@if ($account->website)
diff --git a/resources/views/expenses/edit.blade.php b/resources/views/expenses/edit.blade.php
index 589c8d8cda8f..2b999114f5ac 100644
--- a/resources/views/expenses/edit.blade.php
+++ b/resources/views/expenses/edit.blade.php
@@ -105,6 +105,27 @@
@if ($account->hasLogo())
- {!! HTML::image($account->getLogoPath()) !!}
+ {!! HTML::image($account->getLogoURL()) !!}
@else
{{ $account->name}}
@endif diff --git a/resources/views/invoices/edit.blade.php b/resources/views/invoices/edit.blade.php index a12ab9e1f996..5c70a5be1d17 100644 --- a/resources/views/invoices/edit.blade.php +++ b/resources/views/invoices/edit.blade.php @@ -17,6 +17,17 @@ label.control-label[for=invoice_number] { font-weight: normal !important; } + + select.tax-select { + width: 50%; + float: left; + } + + #scrollable-dropdown-menu .tt-menu { + max-height: 150px; + overflow-y: auto; + overflow-x: hidden; + } @stop @@ -38,7 +49,7 @@ {!! Former::open($url) ->method($method) - ->addClass('warn-on-exit') + ->addClass('warn-on-exit main-form') ->autocomplete('off') ->onsubmit('return onFormSubmit(event)') ->rules(array( @@ -53,7 +64,7 @@
-
+
{{ $invoiceLabels['unit_cost'] }}
-
+
{{ trans('texts.line_total') }}
@@ -216,7 +227,9 @@
$parent.invoice_items().length > 1" class="fa fa-sort">
-
+
@@ -268,18 +294,21 @@
@@ -351,9 +406,23 @@
{{ trans('texts.tax') }}
@endif
-
-
-
+ {!! Former::select('')
+ ->id('taxRateSelect1')
+ ->addOption('', '')
+ ->options($taxRateOptions)
+ ->addClass('tax-select')
+ ->data_bind('value: tax1')
+ ->raw() !!}
+
+
+ {!! Former::select('')
+ ->addOption('', '')
+ ->options($taxRateOptions)
+ ->addClass('tax-select')
+ ->data_bind('value: tax2')
+ ->raw() !!}
+
+
@include('invoices.pdf', ['account' => Auth::user()->account, 'pdfHeight' => 800]) - + + @if (Utils::isPro() && $invoice->account->invoice_embed_documents) + @foreach ($invoice->documents as $document) + @if($document->isPDFEmbeddable()) + + @endif + @endforeach + @foreach ($invoice->expenses as $expense) + @foreach ($expense->documents as $document) + @if($document->isPDFEmbeddable()) + + @endif + @endforeach + @endforeach + @endif @stop \ No newline at end of file diff --git a/resources/views/invoices/knockout.blade.php b/resources/views/invoices/knockout.blade.php index 029a81bc0b67..8fe4bcbcce80 100644 --- a/resources/views/invoices/knockout.blade.php +++ b/resources/views/invoices/knockout.blade.php @@ -7,8 +7,6 @@ function ViewModel(data) { //self.invoice = data ? false : new InvoiceModel(); self.invoice = ko.observable(data ? false : new InvoiceModel()); self.expense_currency_id = ko.observable(); - self.tax_rates = ko.observableArray(); - self.tax_rates.push(new TaxRateModel()); // add blank row self.products = {!! $products !!}; self.loadClient = function(client) { @@ -47,11 +45,6 @@ function ViewModel(data) { return new InvoiceModel(options.data); } }, - 'tax_rates': { - create: function(options) { - return new TaxRateModel(options.data); - } - }, } if (data) { @@ -59,13 +52,11 @@ function ViewModel(data) { } self.invoice_taxes.show = ko.computed(function() { - if (self.invoice_taxes() && self.tax_rates().length > 1) { + if (self.invoice().tax_name1() || self.invoice().tax_name2()) { return true; } - if (self.invoice().tax_rate() > 0) { - return true; - } - return false; + + return self.invoice_taxes() && {{ count($taxRateOptions) ? 'true' : 'false' }}; }); self.invoice_item_taxes.show = ko.computed(function() { @@ -74,47 +65,13 @@ function ViewModel(data) { } for (var i=0; i 0) {
+ if (item.tax_name1() || item.tax_name2()) {
return true;
}
}
return false;
});
- self.addTaxRate = function(data) {
- var itemModel = new TaxRateModel(data);
- self.tax_rates.push(itemModel);
- applyComboboxListeners();
- }
-
- self.getTaxRateById = function(id) {
- for (var i=0; i 0) {
- // var tax = roundToTwo(total * (taxRate/100));
- // return self.formatMoney(tax);
- //} else {
- // return self.formatMoney(0);
- //}
- var tax = roundToTwo(total * (taxRate/100));
- return self.formatMoney(tax);
+ var taxRate1 = parseFloat(self.tax_rate1());
+ var tax1 = roundToTwo(total * (taxRate1/100));
+
+ var taxRate2 = parseFloat(self.tax_rate2());
+ var tax2 = roundToTwo(total * (taxRate2/100));
+
+ return self.formatMoney(tax1 + tax2);
});
self.totals.itemTaxes = ko.computed(function() {
@@ -413,13 +402,24 @@ function InvoiceModel(data) {
lineTotal -= roundToTwo(lineTotal * (self.discount()/100));
}
}
- var taxAmount = roundToTwo(lineTotal * item.tax_rate() / 100);
+
+ var taxAmount = roundToTwo(lineTotal * item.tax_rate1() / 100);
if (taxAmount) {
- var key = item.tax_name() + item.tax_rate();
+ var key = item.tax_name1() + item.tax_rate1();
if (taxes.hasOwnProperty(key)) {
taxes[key].amount += taxAmount;
} else {
- taxes[key] = {name:item.tax_name(), rate:item.tax_rate(), amount:taxAmount};
+ taxes[key] = {name:item.tax_name1(), rate:item.tax_rate1(), amount:taxAmount};
+ }
+ }
+
+ var taxAmount = roundToTwo(lineTotal * item.tax_rate2() / 100);
+ if (taxAmount) {
+ var key = item.tax_name2() + item.tax_rate2();
+ if (taxes.hasOwnProperty(key)) {
+ taxes[key].amount += taxAmount;
+ } else {
+ taxes[key] = {name:item.tax_name2(), rate:item.tax_rate2(), amount:taxAmount};
}
}
}
@@ -485,8 +485,9 @@ function InvoiceModel(data) {
total = NINJA.parseFloat(total) + customValue2;
}
- var taxRate = parseFloat(self.tax_rate());
- total = NINJA.parseFloat(total) + roundToTwo(total * (taxRate/100));
+ var taxAmount1 = roundToTwo(total * (parseFloat(self.tax_rate1())/100));
+ var taxAmount2 = roundToTwo(total * (parseFloat(self.tax_rate2())/100));
+ total = NINJA.parseFloat(total) + taxAmount1 + taxAmount2;
total = roundToTwo(total);
var taxes = self.totals.itemTaxes();
@@ -620,6 +621,7 @@ function ContactModel(data) {
self.send_invoice = ko.observable(false);
self.invitation_link = ko.observable('');
self.invitation_status = ko.observable('');
+ self.invitation_openend = ko.observable(false);
self.invitation_viewed = ko.observable(false);
self.email_error = ko.observable('');
@@ -661,55 +663,16 @@ function ContactModel(data) {
return str;
});
-}
-
-function TaxRateModel(data) {
- var self = this;
- self.public_id = ko.observable('');
- self.rate = ko.observable(0);
- self.name = ko.observable('');
- self.is_deleted = ko.observable(false);
- self.is_blank = ko.observable(false);
- self.actionsVisible = ko.observable(false);
-
- if (data) {
- ko.mapping.fromJS(data, {}, this);
- }
-
- this.prettyRate = ko.computed({
- read: function () {
- return this.rate() ? roundToTwo(this.rate()) : '';
- },
- write: function (value) {
- this.rate(value);
- },
- owner: this
+
+ self.info_color = ko.computed(function() {
+ if (self.invitation_viewed()) {
+ return '#57D172';
+ } else if (self.invitation_openend()) {
+ return '#FFCC00';
+ } else {
+ return '#B1B5BA';
+ }
});
-
-
- self.displayName = ko.computed({
- read: function () {
- var name = self.name() ? self.name() : '';
- var rate = self.rate() ? parseFloat(self.rate()) + '%' : '';
- return name + ' ' + rate;
- },
- write: function (value) {
- // do nothing
- },
- owner: this
- });
-
- self.hideActions = function() {
- self.actionsVisible(false);
- }
-
- self.showActions = function() {
- self.actionsVisible(true);
- }
-
- self.isEmpty = function() {
- return !self.rate() && !self.name();
- }
}
function ItemModel(data) {
@@ -720,21 +683,35 @@ function ItemModel(data) {
self.qty = ko.observable(0);
self.custom_value1 = ko.observable('');
self.custom_value2 = ko.observable('');
- self.tax_name = ko.observable('');
- self.tax_rate = ko.observable(0);
+ self.tax_name1 = ko.observable('');
+ self.tax_rate1 = ko.observable(0);
+ self.tax_name2 = ko.observable('');
+ self.tax_rate2 = ko.observable(0);
self.task_public_id = ko.observable('');
self.expense_public_id = ko.observable('');
self.actionsVisible = ko.observable(false);
- self._tax = ko.observable();
- this.tax = ko.computed({
+ this.tax1 = ko.computed({
read: function () {
- return self._tax();
+ return self.tax_rate1() + ' ' + self.tax_name1();
},
write: function(value) {
- self._tax(value);
- self.tax_name(value.name());
- self.tax_rate(value.rate());
+ var rate = value.substr(0, value.indexOf(' '));
+ var name = value.substr(value.indexOf(' ') + 1);
+ self.tax_name1(name);
+ self.tax_rate1(rate);
+ }
+ })
+
+ this.tax2 = ko.computed({
+ read: function () {
+ return self.tax_rate2() + ' ' + self.tax_name2();
+ },
+ write: function(value) {
+ var rate = value.substr(0, value.indexOf(' '));
+ var name = value.substr(value.indexOf(' ') + 1);
+ self.tax_name2(name);
+ self.tax_rate2(rate);
}
})
@@ -758,16 +735,8 @@ function ItemModel(data) {
owner: this
});
- self.mapping = {
- 'tax': {
- create: function(options) {
- return new TaxRateModel(options.data);
- }
- }
- }
-
if (data) {
- ko.mapping.fromJS(data, self.mapping, this);
+ ko.mapping.fromJS(data, {}, this);
}
self.wrapped_notes = ko.computed({
@@ -810,6 +779,45 @@ function ItemModel(data) {
this.onSelect = function() {}
}
+
+function DocumentModel(data) {
+ var self = this;
+ self.public_id = ko.observable(0);
+ self.size = ko.observable(0);
+ self.name = ko.observable('');
+ self.type = ko.observable('');
+ self.url = ko.observable('');
+
+ self.update = function(data){
+ ko.mapping.fromJS(data, {}, this);
+ }
+
+ if (data) {
+ self.update(data);
+ }
+}
+
+var ExpenseModel = function(data) {
+ var self = this;
+
+ self.mapping = {
+ 'documents': {
+ create: function(options) {
+ return new DocumentModel(options.data);
+ }
+ }
+ }
+
+ self.description = ko.observable('');
+ self.qty = ko.observable(0);
+ self.public_id = ko.observable(0);
+ self.amount = ko.observable();
+ self.converted_amount = ko.observable();
+
+ if (data) {
+ ko.mapping.fromJS(data, self.mapping, this);
+ }
+};
/* Custom binding for product key typeahead */
ko.bindingHandlers.typeahead = {
@@ -824,6 +832,7 @@ ko.bindingHandlers.typeahead = {
{
name: 'data',
display: allBindings.key,
+ limit: 50,
source: searchData(allBindings.items, allBindings.key)
}).on('typeahead:select', function(element, datum, name) {
@if (Auth::user()->account->fill_products)
@@ -842,7 +851,9 @@ ko.bindingHandlers.typeahead = {
}
@if ($account->invoice_item_taxes)
if (datum.default_tax_rate) {
- model.tax(self.model.getTaxRateById(datum.default_tax_rate.public_id));
+ model.tax_rate1(datum.default_tax_rate.rate);
+ model.tax_name1(datum.default_tax_rate.name);
+ model.tax1(datum.default_tax_rate.rate + ' ' + datum.default_tax_rate.name);
}
@endif
@endif
diff --git a/resources/views/invoices/pdf.blade.php b/resources/views/invoices/pdf.blade.php
index d2e8648b53f7..1c8389affeba 100644
--- a/resources/views/invoices/pdf.blade.php
+++ b/resources/views/invoices/pdf.blade.php
@@ -75,7 +75,7 @@
logoImages.imageLogoHeight3 = 81/2;
@if ($account->hasLogo())
- window.accountLogo = "{{ Form::image_data($account->getLogoPath()) }}";
+ window.accountLogo = "{{ Form::image_data($account->getLogoRaw(), true) }}";
if (window.invoice) {
invoice.image = window.accountLogo;
invoice.imageWidth = {{ $account->getLogoWidth() }};
@@ -123,7 +123,7 @@
$('#theFrame').attr('src', string).show();
} else {
if (isRefreshing) {
- //needsRefresh = true;
+ needsRefresh = true;
return;
}
isRefreshing = true;
diff --git a/resources/views/invoices/view.blade.php b/resources/views/invoices/view.blade.php
index c1ba3822899a..08f5cd9827cd 100644
--- a/resources/views/invoices/view.blade.php
+++ b/resources/views/invoices/view.blade.php
@@ -24,7 +24,6 @@
@if ($checkoutComToken)
@include('partials.checkout_com_payment')
@else
-
@@ -105,7 +116,7 @@
data-bind="visible: $data.email_error, tooltip: {title: $data.email_error}">
+ style: {color: $data.info_color}">
@endif
@@ -204,7 +215,7 @@
@endif
{!! Former::textarea('public_notes')->data_bind("value: wrapped_notes, valueUpdate: 'afterkeydown'")
- ->label(null)->style('resize: none; min-width: 450px;')->rows(3) !!}
+ ->label(null)->style('resize: none; width: 500px;')->rows(4) !!}
{!! Former::textarea('terms')->data_bind("value:wrapped_terms, placeholder: terms_placeholder, valueUpdate: 'afterkeydown'")
- ->label(false)->style('resize: none; min-width: 450px')->rows(3)
+ ->label(false)->style('resize: none; width: 500px')->rows(4)
->help('
') !!}
+ @if ($account->isPro())
+
+ @endif
@include('invoices.pdf', ['account' => Auth::user()->account, 'pdfHeight' => 800]) - + + @if (Utils::isPro() && $invoice->account->invoice_embed_documents) + @foreach ($invoice->documents as $document) + @if($document->isPDFEmbeddable()) + + @endif + @endforeach + @foreach ($invoice->expenses as $expense) + @foreach ($expense->documents as $document) + @if($document->isPDFEmbeddable()) + + @endif + @endforeach + @endforeach + @endif @stop \ No newline at end of file diff --git a/resources/views/invoices/knockout.blade.php b/resources/views/invoices/knockout.blade.php index 029a81bc0b67..8fe4bcbcce80 100644 --- a/resources/views/invoices/knockout.blade.php +++ b/resources/views/invoices/knockout.blade.php @@ -7,8 +7,6 @@ function ViewModel(data) { //self.invoice = data ? false : new InvoiceModel(); self.invoice = ko.observable(data ? false : new InvoiceModel()); self.expense_currency_id = ko.observable(); - self.tax_rates = ko.observableArray(); - self.tax_rates.push(new TaxRateModel()); // add blank row self.products = {!! $products !!}; self.loadClient = function(client) { @@ -47,11 +45,6 @@ function ViewModel(data) { return new InvoiceModel(options.data); } }, - 'tax_rates': { - create: function(options) { - return new TaxRateModel(options.data); - } - }, } if (data) { @@ -59,13 +52,11 @@ function ViewModel(data) { } self.invoice_taxes.show = ko.computed(function() { - if (self.invoice_taxes() && self.tax_rates().length > 1) { + if (self.invoice().tax_name1() || self.invoice().tax_name2()) { return true; } - if (self.invoice().tax_rate() > 0) { - return true; - } - return false; + + return self.invoice_taxes() && {{ count($taxRateOptions) ? 'true' : 'false' }}; }); self.invoice_item_taxes.show = ko.computed(function() { @@ -74,47 +65,13 @@ function ViewModel(data) { } for (var i=0; i
@if ($invoice->is_quote)
{!! Button::normal(trans('texts.download_pdf'))->withAttributes(['onclick' => 'onDownloadClick()'])->large() !!}
@@ -39,13 +38,47 @@
{{ trans('texts.pay_now') }}
@endif
@else
- {!! Button::normal('Download PDF')->withAttributes(['onclick' => 'onDownloadClick()'])->large() !!}
+ {!! Button::normal(trans('texts.download_pdf'))->withAttributes(['onclick' => 'onDownloadClick()'])->large() !!}
@endif
+
+ @if(!empty($documentsZipURL))
+ {!! Button::normal(trans('texts.download_documents', array('size'=>Form::human_filesize($documentsZipSize))))->asLinkTo($documentsZipURL)->large() !!}
+ @endif
+
@endif
- + @if ($account->isPro() && $invoice->hasDocuments()) +
+
+ @endif
+
+ @if ($account->isPro() && $account->invoice_embed_documents)
+ @foreach ($invoice->documents as $document)
+ @if($document->isPDFEmbeddable())
+
+ @endif
+ @endforeach
+ @foreach ($invoice->expenses as $expense)
+ @foreach ($expense->documents as $document)
+ @if($document->isPDFEmbeddable())
+
+ @endif
+ @endforeach
+ @endforeach
+ @endif
+
@endif
@stop
@@ -174,22 +174,8 @@
window.location = '{{ URL::to('expenses/create/' . $vendor->public_id ) }}';
});
- // load datatable data when tab is shown and remember last tab selected
- $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
- var target = $(e.target).attr("href") // activated tab
- target = target.substring(1);
- localStorage.setItem('vendor_tab', target);
- if (!loadedTabs.hasOwnProperty(target)) {
- loadedTabs[target] = true;
- window['load_' + target]();
- }
- });
- var tab = localStorage.getItem('vendor_tab');
- if (tab && tab != 'activity') {
- $('.nav-tabs a[href="#' + tab.replace('#', '') + '"]').tab('show');
- } else {
- //window['load_activity']();
- }
+ $('.nav-tabs a[href="#expenses"]').tab('show');
+ load_expenses();
});
function onArchiveClick() {
diff --git a/storage/templates/bold.js b/storage/templates/bold.js
old mode 100644
new mode 100755
index b877f5f4b86c..69e9d55ddfab
--- a/storage/templates/bold.js
+++ b/storage/templates/bold.js
@@ -50,7 +50,7 @@
"paddingTop": "$amount:14",
"paddingBottom": "$amount:14"
}
- },
+ },
{
"columns": [
{
@@ -72,7 +72,13 @@
"paddingBottom": "$amount:4"
}
}]
- }
+ },
+ {
+ "stack": [
+ "$invoiceDocuments"
+ ],
+ "style": "invoiceDocuments"
+ }
],
"footer":
[
@@ -254,6 +260,12 @@
"help": {
"fontSize": "$fontSizeSmaller",
"color": "#737373"
+ },
+ "invoiceDocuments": {
+ "margin": [47, 0, 47, 0]
+ },
+ "invoiceDocument": {
+ "margin": [0, 10, 0, 10]
}
},
"pageMargins": [0, 80, 0, 40]
diff --git a/storage/templates/clean.js b/storage/templates/clean.js
old mode 100644
new mode 100755
index e367a5893217..a154bb0f95dc
--- a/storage/templates/clean.js
+++ b/storage/templates/clean.js
@@ -87,6 +87,12 @@
}
}
]
+ },
+ {
+ "stack": [
+ "$invoiceDocuments"
+ ],
+ "style": "invoiceDocuments"
}
],
"defaultStyle": {
@@ -200,6 +206,12 @@
"help": {
"fontSize": "$fontSizeSmaller",
"color": "#737373"
+ },
+ "invoiceDocuments": {
+ "margin": [7, 0, 7, 0]
+ },
+ "invoiceDocument": {
+ "margin": [0, 10, 0, 10]
}
},
"pageMargins": [40, 40, 40, 60]
diff --git a/storage/templates/modern.js b/storage/templates/modern.js
old mode 100644
new mode 100755
index 5c1767bb4bab..a4043413a2eb
--- a/storage/templates/modern.js
+++ b/storage/templates/modern.js
@@ -85,166 +85,179 @@
"margin": [0, 16, 8, 0]
}
]
- } ],
- "footer": [
- {
- "canvas": [
- {
- "type": "line", "x1": 0, "y1": 0, "x2": 600, "y2": 0,"lineWidth": 100,"lineColor":"$primaryColor:#f26621"
- }]
- ,"width":10
- },
- {
- "columns": [
- {
- "width": 350,
- "stack": [
- {
- "text": "$invoiceFooter",
- "margin": [40, -40, 40, 0],
- "alignment": "left",
- "color": "#FFFFFF"
-
- }
- ]
- },
- {
- "stack": "$accountDetails",
- "margin": [0, -40, 0, 0],
- "width": "*"
- },
- {
- "stack": "$accountAddress",
- "margin": [0, -40, 0, 0],
- "width": "*"
- }
- ]
- }
- ],
- "header": [
- {
- "canvas": [{ "type": "line", "x1": 0, "y1": 0, "x2": 600, "y2": 0,"lineWidth": 200,"lineColor":"$primaryColor:#f26621"}],"width":10
},
{
- "columns": [
+ "stack": [
+ "$invoiceDocuments"
+ ],
+ "style": "invoiceDocuments"
+ }
+ ],
+ "footer": [
+ {
+ "canvas": [
+ {
+ "type": "line", "x1": 0, "y1": 0, "x2": 600, "y2": 0,"lineWidth": 100,"lineColor":"$primaryColor:#f26621"
+ }]
+ ,"width":10
+ },
+ {
+ "columns": [
+ {
+ "width": 350,
+ "stack": [
{
- "text": "$accountName", "bold": true,"font":"$headerFont","fontSize":30,"color":"#ffffff","margin":[40,20,0,0],"width":350
+ "text": "$invoiceFooter",
+ "margin": [40, -40, 40, 0],
+ "alignment": "left",
+ "color": "#FFFFFF"
+
}
]
},
{
- "width": 300,
- "table": {
- "body": "$invoiceDetails"
- },
- "layout": "noBorders",
- "margin": [400, -40, 0, 0]
+ "stack": "$accountDetails",
+ "margin": [0, -40, 0, 0],
+ "width": "*"
+ },
+ {
+ "stack": "$accountAddress",
+ "margin": [0, -40, 0, 0],
+ "width": "*"
}
- ],
- "defaultStyle": {
- "font": "$bodyFont",
- "fontSize": "$fontSize",
- "margin": [8, 4, 8, 4]
+ ]
+ }
+ ],
+ "header": [
+ {
+ "canvas": [{ "type": "line", "x1": 0, "y1": 0, "x2": 600, "y2": 0,"lineWidth": 200,"lineColor":"$primaryColor:#f26621"}],"width":10
+ },
+ {
+ "columns": [
+ {
+ "text": "$accountName", "bold": true,"font":"$headerFont","fontSize":30,"color":"#ffffff","margin":[40,20,0,0],"width":350
+ }
+ ]
+ },
+ {
+ "width": 300,
+ "table": {
+ "body": "$invoiceDetails"
+ },
+ "layout": "noBorders",
+ "margin": [400, -40, 0, 0]
+ }
+ ],
+ "defaultStyle": {
+ "font": "$bodyFont",
+ "fontSize": "$fontSize",
+ "margin": [8, 4, 8, 4]
+ },
+ "styles": {
+ "primaryColor":{
+ "color": "$primaryColor:#299CC2"
},
- "styles": {
- "primaryColor":{
- "color": "$primaryColor:#299CC2"
- },
- "accountName": {
- "margin": [4, 2, 4, 2],
- "color": "$primaryColor:#299CC2"
- },
- "accountDetails": {
- "margin": [4, 2, 4, 2],
- "color": "#FFFFFF"
- },
- "accountAddress": {
- "margin": [4, 2, 4, 2],
- "color": "#FFFFFF"
- },
- "clientDetails": {
- "margin": [0, 2, 4, 2]
- },
- "invoiceDetails": {
- "color": "#FFFFFF"
- },
- "invoiceLineItemsTable": {
- "margin": [0, 0, 0, 16]
- },
- "productKey": {
- "bold": true
- },
- "clientName": {
- "bold": true
- },
- "tableHeader": {
- "bold": true,
- "color": "#FFFFFF",
- "fontSize": "$fontSizeLargest",
- "fillColor": "$secondaryColor:#403d3d"
- },
- "costTableHeader": {
- "alignment": "right"
- },
- "qtyTableHeader": {
- "alignment": "right"
- },
- "taxTableHeader": {
- "alignment": "right"
- },
- "lineTotalTableHeader": {
- "alignment": "right"
- },
- "balanceDueLabel": {
- "fontSize": "$fontSizeLargest",
- "color":"#FFFFFF",
- "alignment":"right",
- "bold": true
- },
- "balanceDue": {
- "fontSize": "$fontSizeLargest",
- "color":"#FFFFFF",
- "bold": true,
- "alignment":"right"
- },
- "cost": {
- "alignment": "right"
- },
- "quantity": {
- "alignment": "right"
- },
- "tax": {
- "alignment": "right"
- },
- "lineTotal": {
- "alignment": "right"
- },
- "subtotals": {
- "alignment": "right"
- },
- "termsLabel": {
- "bold": true,
- "margin": [0, 0, 0, 4]
- },
- "invoiceNumberLabel": {
- "bold": true
- },
- "invoiceNumber": {
- "bold": true
- },
- "header": {
- "font": "$headerFont",
- "fontSize": "$fontSizeLargest",
- "bold": true
- },
- "subheader": {
- "font": "$headerFont",
- "fontSize": "$fontSizeLarger"
- },
- "help": {
- "fontSize": "$fontSizeSmaller",
- "color": "#737373"
- }
+ "accountName": {
+ "margin": [4, 2, 4, 2],
+ "color": "$primaryColor:#299CC2"
},
- "pageMargins": [40, 120, 40, 50]
- }
\ No newline at end of file
+ "accountDetails": {
+ "margin": [4, 2, 4, 2],
+ "color": "#FFFFFF"
+ },
+ "accountAddress": {
+ "margin": [4, 2, 4, 2],
+ "color": "#FFFFFF"
+ },
+ "clientDetails": {
+ "margin": [0, 2, 4, 2]
+ },
+ "invoiceDetails": {
+ "color": "#FFFFFF"
+ },
+ "invoiceLineItemsTable": {
+ "margin": [0, 0, 0, 16]
+ },
+ "productKey": {
+ "bold": true
+ },
+ "clientName": {
+ "bold": true
+ },
+ "tableHeader": {
+ "bold": true,
+ "color": "#FFFFFF",
+ "fontSize": "$fontSizeLargest",
+ "fillColor": "$secondaryColor:#403d3d"
+ },
+ "costTableHeader": {
+ "alignment": "right"
+ },
+ "qtyTableHeader": {
+ "alignment": "right"
+ },
+ "taxTableHeader": {
+ "alignment": "right"
+ },
+ "lineTotalTableHeader": {
+ "alignment": "right"
+ },
+ "balanceDueLabel": {
+ "fontSize": "$fontSizeLargest",
+ "color":"#FFFFFF",
+ "alignment":"right",
+ "bold": true
+ },
+ "balanceDue": {
+ "fontSize": "$fontSizeLargest",
+ "color":"#FFFFFF",
+ "bold": true,
+ "alignment":"right"
+ },
+ "cost": {
+ "alignment": "right"
+ },
+ "quantity": {
+ "alignment": "right"
+ },
+ "tax": {
+ "alignment": "right"
+ },
+ "lineTotal": {
+ "alignment": "right"
+ },
+ "subtotals": {
+ "alignment": "right"
+ },
+ "termsLabel": {
+ "bold": true,
+ "margin": [0, 0, 0, 4]
+ },
+ "invoiceNumberLabel": {
+ "bold": true
+ },
+ "invoiceNumber": {
+ "bold": true
+ },
+ "header": {
+ "font": "$headerFont",
+ "fontSize": "$fontSizeLargest",
+ "bold": true
+ },
+ "subheader": {
+ "font": "$headerFont",
+ "fontSize": "$fontSizeLarger"
+ },
+ "help": {
+ "fontSize": "$fontSizeSmaller",
+ "color": "#737373"
+ },
+ "invoiceDocuments": {
+ "margin": [7, 0, 7, 0]
+ },
+ "invoiceDocument": {
+ "margin": [0, 10, 0, 10]
+ }
+ },
+ "pageMargins": [40, 120, 40, 50]
+}
\ No newline at end of file
diff --git a/storage/templates/plain.js b/storage/templates/plain.js
old mode 100644
new mode 100755
index b260a6727e75..916ace88189f
--- a/storage/templates/plain.js
+++ b/storage/templates/plain.js
@@ -56,7 +56,7 @@
"paddingTop": "$amount:8",
"paddingBottom": "$amount:8"
}
- },
+ },
{
"columns": [
"$notesAndTerms",
@@ -77,6 +77,12 @@
}
}
]
+ },
+ {
+ "stack": [
+ "$invoiceDocuments"
+ ],
+ "style": "invoiceDocuments"
}
],
"footer": {
@@ -166,7 +172,13 @@
"help": {
"fontSize": "$fontSizeSmaller",
"color": "#737373"
- }
+ },
+ "invoiceDocuments": {
+ "margin": [7, 0, 7, 0]
+ },
+ "invoiceDocument": {
+ "margin": [0, 10, 0, 10]
+ }
},
"pageMargins": [40, 40, 40, 60]
}
\ No newline at end of file
diff --git a/tests/_support/_generated/AcceptanceTesterActions.php b/tests/_support/_generated/AcceptanceTesterActions.php
index cebe7fff8f20..82427d1e2a5e 100644
--- a/tests/_support/_generated/AcceptanceTesterActions.php
+++ b/tests/_support/_generated/AcceptanceTesterActions.php
@@ -1,4 +1,4 @@
-scrollTo(['css' => '.checkout'], 20, 50);
+ * ?>
+ * ```
+ *
+ * @param $selector
+ * @param int $offsetX
+ * @param int $offsetY
+ * @see \Codeception\Module\WebDriver::scrollTo()
+ */
+ public function scrollTo($selector, $offsetX = null, $offsetY = null) {
+ return $this->getScenario()->runStep(new \Codeception\Step\Action('scrollTo', func_get_args()));
+ }
+
+
/**
* [!] Method is generated. Documentation taken from corresponding module.
*
diff --git a/tests/acceptance/TaxRatesCest.php b/tests/acceptance/TaxRatesCest.php
index 6320482c9e62..75f7de7a7508 100644
--- a/tests/acceptance/TaxRatesCest.php
+++ b/tests/acceptance/TaxRatesCest.php
@@ -72,13 +72,13 @@ class TaxRatesCest
$I->selectDropdown($I, $clientEmail, '.client_select .dropdown-toggle');
$I->fillField('table.invoice-table tbody tr:nth-child(1) #product_key', $productKey);
$I->click('table.invoice-table tbody tr:nth-child(1) .tt-selectable');
- $I->selectOption('#taxRateSelect', $invoiceTaxName . ' ' . floatval($invoiceTaxRate) . '%');
- $I->wait(2);
+ $I->selectOption('#taxRateSelect1', $invoiceTaxName . ' ' . floatval($invoiceTaxRate) . '%');
+ $I->wait(3);
// check total is right before saving
$I->see("\${$total}");
$I->click('Save');
- $I->wait(1);
+ $I->wait(2);
$I->see($clientEmail);
// check total is right after saving
{{ trans('texts.documents_header') }}
+-
+ @foreach ($invoice->documents as $document)
+
- {{$document->name}} ({{Form::human_filesize($document->size)}}) + @endforeach + @foreach ($invoice->expenses as $expense) + @foreach ($expense->documents as $document) +
- {{$document->name}} ({{Form::human_filesize($document->size)}}) + @endforeach + @endforeach +