From 4992da627046349c60dbcbcb10f9b946b1040cc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Tue, 2 Mar 2021 13:42:25 +0100 Subject: [PATCH 01/17] Highlight & make links in terms pop up clickable --- package-lock.json | 44 +++++++++++++++++++ package.json | 1 + public/js/clients/linkify-urls.js | 2 + public/js/clients/linkify-urls.js.LICENSE.txt | 9 ++++ public/mix-manifest.json | 1 + resources/js/clients/linkify-urls.js | 19 ++++++++ .../invoices/includes/terms.blade.php | 8 +++- webpack.mix.js | 4 ++ 8 files changed, 86 insertions(+), 2 deletions(-) create mode 100644 public/js/clients/linkify-urls.js create mode 100644 public/js/clients/linkify-urls.js.LICENSE.txt create mode 100644 resources/js/clients/linkify-urls.js diff --git a/package-lock.json b/package-lock.json index 7b77f7e2e1de..e5cc670bfe63 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2857,6 +2857,24 @@ "sha.js": "^2.4.8" } }, + "create-html-element": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/create-html-element/-/create-html-element-2.1.0.tgz", + "integrity": "sha512-ofbOpJh3GSDsyINuqppupKRUcQHnXSyvwvk0F5DlEtwKwb+thdFoJAtYczy7bIZWdsQjZfADUc38pF4gVd0o+Q==", + "requires": { + "escape-goat": "^1.3.0", + "html-tags": "^2.0.0", + "stringify-attributes": "^1.0.0", + "type-fest": "^0.3.0" + }, + "dependencies": { + "html-tags": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-2.0.0.tgz", + "integrity": "sha1-ELMKOGCF9Dzt41PMj6fLDe7qZos=" + } + } + }, "credit-card-type": { "version": "8.3.0", "resolved": "https://registry.npmjs.org/credit-card-type/-/credit-card-type-8.3.0.tgz", @@ -3730,6 +3748,11 @@ "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==" }, + "escape-goat": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-1.3.0.tgz", + "integrity": "sha512-E2nU1Y39N5UgfLU8qwMlK0vZrZprIwWLeVmDYN8wd/e37hMtGzu2w1DBiREts0XHfgyZEQlj/hYr0H0izF0HDQ==" + }, "escape-html": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", @@ -5721,6 +5744,14 @@ "integrity": "sha1-eZllXoZGwX8In90YfRUNMyTVRRM=", "dev": true }, + "linkify-urls": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/linkify-urls/-/linkify-urls-3.1.1.tgz", + "integrity": "sha512-sRxMSunCnLFtZ4iVkMqHhZKSJ3MC/nRAvej8Ou3pEEEPBL0iVN91mZvdFREKcGv3VNcakbT4qsfOnnWMEbA59w==", + "requires": { + "create-html-element": "^2.1.0" + } + }, "listr": { "version": "0.14.3", "resolved": "https://registry.npmjs.org/listr/-/listr-0.14.3.tgz", @@ -8882,6 +8913,14 @@ "safe-buffer": "~5.1.0" } }, + "stringify-attributes": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/stringify-attributes/-/stringify-attributes-1.0.0.tgz", + "integrity": "sha1-nosvmpRn57SAk8shJOvBwX5jgsU=", + "requires": { + "escape-goat": "^1.1.0" + } + }, "strip-ansi": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", @@ -9283,6 +9322,11 @@ "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz", "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==" }, + "type-fest": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.3.1.tgz", + "integrity": "sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==" + }, "type-is": { "version": "1.6.18", "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", diff --git a/package.json b/package.json index ebe239820e64..f3c1e6a0189d 100644 --- a/package.json +++ b/package.json @@ -26,6 +26,7 @@ "cross-env": "^7.0.3", "jsignature": "^2.1.3", "laravel-mix": "^5.0.9", + "linkify-urls": "^3.1.1", "lodash": "^4.17.20", "resolve-url-loader": "^3.1.2", "sass": "^1.32.7", diff --git a/public/js/clients/linkify-urls.js b/public/js/clients/linkify-urls.js new file mode 100644 index 000000000000..19fb4fffc657 --- /dev/null +++ b/public/js/clients/linkify-urls.js @@ -0,0 +1,2 @@ +/*! For license information please see linkify-urls.js.LICENSE.txt */ +!function(e){var t={};function r(n){if(t[n])return t[n].exports;var o=t[n]={i:n,l:!1,exports:{}};return e[n].call(o.exports,o,o.exports,r),o.l=!0,o.exports}r.m=e,r.c=t,r.d=function(e,t,n){r.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:n})},r.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},r.t=function(e,t){if(1&t&&(e=r(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var n=Object.create(null);if(r.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var o in e)r.d(n,o,function(t){return e[t]}.bind(null,o));return n},r.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(t,"a",t),t},r.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},r.p="/",r(r.s=16)}({16:function(e,t,r){e.exports=r("cN42")},Ievl:function(e,t,r){"use strict";t.escape=e=>e.replace(/&/g,"&").replace(/"/g,""").replace(/'/g,"'").replace(//g,">"),t.unescape=e=>e.replace(/>/g,">").replace(/</g,"<").replace(/'/g,"'").replace(/"/g,'"').replace(/&/g,"&"),t.escapeTag=function(e){let r=e[0];for(let n=1;n{if((e=Object.assign({name:"div",attributes:{},html:""},e)).html&&e.text)throw new Error("The `html` and `text` options are mutually exclusive");const t=e.text?a.escape(e.text):e.html;let r=`<${e.name}${n(e.attributes)}>`;return u.has(e.name)||(r+=`${t}`),r}},cN42:function(e,t,r){var n=r("jG5F");document.querySelectorAll("[data-ref=entity-terms]").forEach((function(e){e.innerHTML=n(e.innerText,{attributes:{target:"_blank",class:"text-primary"}})}))},dBjz:function(e,t,r){"use strict";const n=r("Ievl");e.exports=e=>{const t=[];for(const r of Object.keys(e)){let o=e[r];if(!1===o)continue;Array.isArray(o)&&(o=o.join(" "));let a=n.escape(r);!0!==o&&(a+=`="${n.escape(String(o))}"`),t.push(a)}return t.length>0?" "+t.join(" "):""}},jG5F:function(e,t,r){"use strict";const n=r("YIIW"),o=(e,t)=>n({name:"a",attributes:{href:"",...t.attributes,href:e},text:void 0===t.value?e:void 0,html:void 0===t.value?void 0:"function"==typeof t.value?t.value(e):t.value});e.exports=(e,t)=>{if("string"===(t={attributes:{},type:"string",...t}).type)return((e,t)=>e.replace(/((?o(e,t)))(e,t);if("dom"===t.type)return((e,t)=>{const r=document.createDocumentFragment();for(const[a,u]of Object.entries(e.split(/((?0&&r.append(u);var n;return r})(e,t);throw new Error("The type option must be either `dom` or `string`")}},sW1H:function(e){e.exports=JSON.parse('["area","base","br","col","embed","hr","img","input","link","menuitem","meta","param","source","track","wbr"]')}}); \ No newline at end of file diff --git a/public/js/clients/linkify-urls.js.LICENSE.txt b/public/js/clients/linkify-urls.js.LICENSE.txt new file mode 100644 index 000000000000..585c6ab0e4fc --- /dev/null +++ b/public/js/clients/linkify-urls.js.LICENSE.txt @@ -0,0 +1,9 @@ +/** + * Invoice Ninja (https://invoiceninja.com) + * + * @link https://github.com/invoiceninja/invoiceninja source repository + * + * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com) + * + * @license https://opensource.org/licenses/AAL + */ diff --git a/public/mix-manifest.json b/public/mix-manifest.json index fa6f474e15b1..75d737b930db 100755 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -3,6 +3,7 @@ "/css/app.css": "/css/app.css?id=58736e43b16ddde82ba9", "/js/clients/invoices/action-selectors.js": "/js/clients/invoices/action-selectors.js?id=a09bb529b8e1826f13b4", "/js/clients/invoices/payment.js": "/js/clients/invoices/payment.js?id=8ce8955ba775ea5f47d1", + "/js/clients/linkify-urls.js": "/js/clients/linkify-urls.js?id=0dc8c34010d09195d2f7", "/js/clients/payment_methods/authorize-authorize-card.js": "/js/clients/payment_methods/authorize-authorize-card.js?id=206d7de4ac97612980ff", "/js/clients/payments/authorize-credit-card-payment.js": "/js/clients/payments/authorize-credit-card-payment.js?id=a376eff2227da398b0ba", "/js/clients/payments/card-js.min.js": "/js/clients/payments/card-js.min.js?id=5469146cd629ea1b5c20", diff --git a/resources/js/clients/linkify-urls.js b/resources/js/clients/linkify-urls.js new file mode 100644 index 000000000000..b6362e1f715b --- /dev/null +++ b/resources/js/clients/linkify-urls.js @@ -0,0 +1,19 @@ +/** + * Invoice Ninja (https://invoiceninja.com) + * + * @link https://github.com/invoiceninja/invoiceninja source repository + * + * @copyright Copyright (c) 2021. Invoice Ninja LLC (https://invoiceninja.com) + * + * @license https://opensource.org/licenses/AAL + */ + +const linkifyUrls = require('linkify-urls'); + +document + .querySelectorAll('[data-ref=entity-terms]') + .forEach((text) => { + text.innerHTML = linkifyUrls(text.innerText, { + attributes: {target: '_blank', class: 'text-primary'} + }); + }); diff --git a/resources/views/portal/ninja2020/invoices/includes/terms.blade.php b/resources/views/portal/ninja2020/invoices/includes/terms.blade.php index 3c28674347a2..b8f83bd9d4d2 100644 --- a/resources/views/portal/ninja2020/invoices/includes/terms.blade.php +++ b/resources/views/portal/ninja2020/invoices/includes/terms.blade.php @@ -12,9 +12,9 @@
@foreach($entities as $entity)
-

{{ $entity_type }} {{ $entity->number }}:

+

{{ $entity_type }} {{ $entity->number }}:

@if($entity->terms) -

{!! $entity->terms !!}

+
{!! $entity->terms !!}
@else {{ ctrans('texts.not_specified') }} @endif @@ -39,3 +39,7 @@
+ +@push('footer') + +@endpush diff --git a/webpack.mix.js b/webpack.mix.js index c5953f800f3e..ef423fb2c701 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -61,6 +61,10 @@ mix.js("resources/js/app.js", "public/js") .js( "resources/js/clients/shared/multiple-downloads.js", "public/js/clients/shared/multiple-downloads.js" + ) + .js( + "resources/js/clients/linkify-urls.js", + "public/js/clients/linkify-urls.js" ); mix.copyDirectory('node_modules/card-js/card-js.min.css', 'public/css/card-js.min.css'); From dfee4d718b0bab180ca74c13c09d3be138daa1d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Tue, 2 Mar 2021 13:43:41 +0100 Subject: [PATCH 02/17] Change "Overdue" to "Past due" in invoices table --- .../ninja2020/components/livewire/invoices-table.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/portal/ninja2020/components/livewire/invoices-table.blade.php b/resources/views/portal/ninja2020/components/livewire/invoices-table.blade.php index 66da6013ceb7..c828f58c5fa3 100644 --- a/resources/views/portal/ninja2020/components/livewire/invoices-table.blade.php +++ b/resources/views/portal/ninja2020/components/livewire/invoices-table.blade.php @@ -20,7 +20,7 @@
- +
From cb0231a1ec7f9367f4c1b02ec1ab505d61ce54f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Tue, 2 Mar 2021 14:06:42 +0100 Subject: [PATCH 03/17] Business: Reduce padding in client & company details section --- resources/views/pdf-designs/business.html | 8 -------- 1 file changed, 8 deletions(-) diff --git a/resources/views/pdf-designs/business.html b/resources/views/pdf-designs/business.html index b1951dfec592..d8407354df23 100644 --- a/resources/views/pdf-designs/business.html +++ b/resources/views/pdf-designs/business.html @@ -41,10 +41,6 @@ color: #AAA9A9; } - #company-details > * { - margin-bottom: 0.8rem; - } - #company-address { display: flex; flex-direction: column; @@ -72,10 +68,6 @@ margin-top: 1rem; } - #client-details > * { - margin-bottom: 0.5rem; - } - #client-details > p:nth-child(1) { color: var(--primary-color); } From 7543ab33ff316066339deb7d1a09a392fa3bfc1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Tue, 2 Mar 2021 14:26:34 +0100 Subject: [PATCH 04/17] Update white label logo --- app/Utils/HtmlEngine.php | 2 +- public/images/new_logo.png | Bin 0 -> 9391 bytes 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 public/images/new_logo.png diff --git a/app/Utils/HtmlEngine.php b/app/Utils/HtmlEngine.php index 11dcbce10247..d03646d79f2a 100644 --- a/app/Utils/HtmlEngine.php +++ b/app/Utils/HtmlEngine.php @@ -346,7 +346,7 @@ class HtmlEngine $data['$font_size'] = ['value' => $this->settings->font_size . 'px', 'label' => '']; - $data['$invoiceninja.whitelabel'] = ['value' => 'https://raw.githubusercontent.com/invoiceninja/invoiceninja/v5-develop/public/images/created-by-invoiceninja-new.png', 'label' => '']; + $data['$invoiceninja.whitelabel'] = ['value' => 'https://raw.githubusercontent.com/invoiceninja/invoiceninja/v5-develop/public/images/new_logo.png', 'label' => '']; $data['$primary_color'] = ['value' => $this->settings->primary_color, 'label' => '']; $data['$secondary_color'] = ['value' => $this->settings->secondary_color, 'label' => '']; diff --git a/public/images/new_logo.png b/public/images/new_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..db89c45ddace965a27b6e5615d362d55c87e1e0f GIT binary patch literal 9391 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 nxd}%R+vWXBl_3)#x?)9rl@$)gBh(w?Y)q)f&m Date: Tue, 2 Mar 2021 14:28:33 +0100 Subject: [PATCH 05/17] Modern: Add borders between header columns (for product, tasks & delivery notes table) --- resources/views/pdf-designs/modern.html | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/resources/views/pdf-designs/modern.html b/resources/views/pdf-designs/modern.html index 1e455903de7a..d4aace1f9f36 100644 --- a/resources/views/pdf-designs/modern.html +++ b/resources/views/pdf-designs/modern.html @@ -97,6 +97,12 @@ width: 100%; } + #product-table th + th, + #delivery-note-table th + th, + #task-table th + th { + border-left: 2px solid white; + } + #product-table > thead > tr > th, #delivery-note-table > thead > tr > th, #task-table > thead > tr > th { From d96d2887c6cee9de5773a50c477a4cc62b122c10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Tue, 2 Mar 2021 14:40:43 +0100 Subject: [PATCH 06/17] Hipster: Push the company logo to top right edge --- resources/views/pdf-designs/hipster.html | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/resources/views/pdf-designs/hipster.html b/resources/views/pdf-designs/hipster.html index 1fe04a9b37ac..0c61a239bc49 100644 --- a/resources/views/pdf-designs/hipster.html +++ b/resources/views/pdf-designs/hipster.html @@ -65,8 +65,13 @@ margin-top: 0.8rem; } + .header-right-side-wrapper-right { + display: flex; + } + .header-wrapper .company-logo { height: 5rem; + margin-left: auto; } .entity-label { @@ -199,16 +204,18 @@
-
+

$to_label:

- +
+ +
From 463f16d14a7eb64558022f94f08365682d5ef6a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Tue, 2 Mar 2021 15:32:20 +0100 Subject: [PATCH 07/17] Update the invoice terms label text (By clicking "Next step" you accept terms -> Click "Agree" to accept terms) --- resources/lang/en/texts.php | 3 +++ .../views/portal/ninja2020/invoices/includes/terms.blade.php | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php index 7699ff50fa1c..1be12e4b0138 100644 --- a/resources/lang/en/texts.php +++ b/resources/lang/en/texts.php @@ -4143,6 +4143,9 @@ $LANG = array( 'hello' => 'Hello', 'group_documents' => 'Group documents', 'quote_approval_confirmation_label' => 'Are you sure you want to approve this quote?', + + 'click_agree_to_accept_terms' => 'Click "Agree" to Accept Terms.', + 'agree' => 'Agree', ); return $LANG; diff --git a/resources/views/portal/ninja2020/invoices/includes/terms.blade.php b/resources/views/portal/ninja2020/invoices/includes/terms.blade.php index b8f83bd9d4d2..2fec680173dd 100644 --- a/resources/views/portal/ninja2020/invoices/includes/terms.blade.php +++ b/resources/views/portal/ninja2020/invoices/includes/terms.blade.php @@ -21,14 +21,14 @@ @endforeach -

{{ ctrans('texts.by_clicking_next_you_accept_terms') }}

+

{{ ctrans('texts.click_agree_to_accept_terms') }}

From a04b0759565d1681b011f9f723422d95e4929612 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Tue, 2 Mar 2021 15:42:42 +0100 Subject: [PATCH 08/17] Update entity labels on PDF --- app/Utils/HtmlEngine.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/Utils/HtmlEngine.php b/app/Utils/HtmlEngine.php index d03646d79f2a..9c1de26c88cb 100644 --- a/app/Utils/HtmlEngine.php +++ b/app/Utils/HtmlEngine.php @@ -125,9 +125,11 @@ class HtmlEngine $data['$terms'] = &$data['$entity.terms']; $data['$view_link'] = ['value' => ''.ctrans('texts.view_invoice').'', 'label' => ctrans('texts.view_invoice')]; $data['$view_url'] = ['value' => $this->invitation->getLink(), 'label' => ctrans('texts.view_invoice')]; + $data['$date'] = ['value' => $this->translateDate($this->entity->date, $this->entity->client->date_format(), $this->entity->client->locale()) ?: ' ', 'label' => ctrans('texts.invoice_date')]; - if($this->entity->project()->exists()) + if($this->entity->project()->exists()) { $data['$project.name'] = ['value' => $this->entity->project->name, 'label' => ctrans('texts.project_name')]; + } } if ($this->entity_string == 'quote') { @@ -137,6 +139,7 @@ class HtmlEngine $data['$terms'] = &$data['$entity.terms']; $data['$view_link'] = ['value' => ''.ctrans('texts.view_quote').'', 'label' => ctrans('texts.view_quote')]; $data['$view_url'] = ['value' => $this->invitation->getLink(), 'label' => ctrans('texts.view_quote')]; + $data['$date'] = ['value' => $this->translateDate($this->entity->date, $this->entity->client->date_format(), $this->entity->client->locale()) ?: ' ', 'label' => ctrans('texts.quote_date')]; } if ($this->entity_string == 'credit') { @@ -147,6 +150,7 @@ class HtmlEngine $data['$view_link'] = ['value' => ''.ctrans('texts.view_credit').'', 'label' => ctrans('texts.view_credit')]; $data['$view_url'] = ['value' => $this->invitation->getLink(), 'label' => ctrans('texts.view_credit')]; // $data['$view_link'] = ['value' => $this->invitation->getLink(), 'label' => ctrans('texts.view_credit')]; + $data['$date'] = ['value' => $this->translateDate($this->entity->date, $this->entity->client->date_format(), $this->entity->client->locale()) ?: ' ', 'label' => ctrans('texts.credit_date')]; } $data['$entity_number'] = &$data['$number']; From b7d152fe523f88b9ce7006a1270ac32ed96eb386 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Tue, 2 Mar 2021 15:43:48 +0100 Subject: [PATCH 09/17] Push new migration timestamp to make sure designs get updated --- ...19_update_designs.php => 2021_03_02_115919_update_designs.php} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename database/migrations/{2021_02_16_115919_update_designs.php => 2021_03_02_115919_update_designs.php} (100%) diff --git a/database/migrations/2021_02_16_115919_update_designs.php b/database/migrations/2021_03_02_115919_update_designs.php similarity index 100% rename from database/migrations/2021_02_16_115919_update_designs.php rename to database/migrations/2021_03_02_115919_update_designs.php From f27645062cde847be6154dcd83f09cf8817aa48e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Tue, 2 Mar 2021 15:53:13 +0100 Subject: [PATCH 10/17] Add "Secure 256-Bit Encryption" on the payment pages --- resources/views/portal/ninja2020/layout/payments.blade.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/resources/views/portal/ninja2020/layout/payments.blade.php b/resources/views/portal/ninja2020/layout/payments.blade.php index ab3e8d4d4096..49bf823d62e0 100644 --- a/resources/views/portal/ninja2020/layout/payments.blade.php +++ b/resources/views/portal/ninja2020/layout/payments.blade.php @@ -31,6 +31,10 @@
@yield('gateway_content')
+ + + Secure 256-bit encryption +
@endsection From 05118ad880d42a768c9863f035e927fecb0a3ad9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Tue, 2 Mar 2021 16:20:27 +0100 Subject: [PATCH 11/17] Client profile settings page: Remove sub-instructional text --- .../portal/ninja2020/profile/settings/general.blade.php | 3 --- .../ninja2020/profile/settings/name-website-logo.blade.php | 3 --- .../ninja2020/profile/settings/personal-address.blade.php | 5 +---- .../ninja2020/profile/settings/shipping-address.blade.php | 3 --- 4 files changed, 1 insertion(+), 13 deletions(-) diff --git a/resources/views/portal/ninja2020/profile/settings/general.blade.php b/resources/views/portal/ninja2020/profile/settings/general.blade.php index f8a32171d365..65e8eaa0c3b9 100644 --- a/resources/views/portal/ninja2020/profile/settings/general.blade.php +++ b/resources/views/portal/ninja2020/profile/settings/general.blade.php @@ -3,9 +3,6 @@

{{ ctrans('texts.profile') }}

-

- {{ ctrans('texts.client_information_text') }} -

diff --git a/resources/views/portal/ninja2020/profile/settings/name-website-logo.blade.php b/resources/views/portal/ninja2020/profile/settings/name-website-logo.blade.php index 11ccba1c50a2..e7c26bc7bbed 100644 --- a/resources/views/portal/ninja2020/profile/settings/name-website-logo.blade.php +++ b/resources/views/portal/ninja2020/profile/settings/name-website-logo.blade.php @@ -3,9 +3,6 @@

{{ ctrans('texts.name_website_logo') }}

-

- {{ ctrans('texts.make_sure_use_full_link') }} -

diff --git a/resources/views/portal/ninja2020/profile/settings/personal-address.blade.php b/resources/views/portal/ninja2020/profile/settings/personal-address.blade.php index e76e405dff0e..53c51709a6d3 100644 --- a/resources/views/portal/ninja2020/profile/settings/personal-address.blade.php +++ b/resources/views/portal/ninja2020/profile/settings/personal-address.blade.php @@ -2,10 +2,7 @@
-

{{ ctrans('texts.personal_address') }}

-

- {{ ctrans('texts.enter_your_personal_address') }} -

+

{{ ctrans('texts.billing_address') }}

diff --git a/resources/views/portal/ninja2020/profile/settings/shipping-address.blade.php b/resources/views/portal/ninja2020/profile/settings/shipping-address.blade.php index 7255f0a208fe..9129fabddef6 100644 --- a/resources/views/portal/ninja2020/profile/settings/shipping-address.blade.php +++ b/resources/views/portal/ninja2020/profile/settings/shipping-address.blade.php @@ -3,9 +3,6 @@

{{ ctrans('texts.shipping_address') }}

-

- {{ ctrans('texts.enter_your_shipping_address') }} -

From 9278c1966afea2872aa9364a4cb50f26c944e141 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Tue, 2 Mar 2021 16:22:40 +0100 Subject: [PATCH 12/17] Add example URL for the Website field in the client portal settings page --- .../ninja2020/profile/settings/name-website-logo.blade.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resources/views/portal/ninja2020/profile/settings/name-website-logo.blade.php b/resources/views/portal/ninja2020/profile/settings/name-website-logo.blade.php index e7c26bc7bbed..94b7c5c8c1f3 100644 --- a/resources/views/portal/ninja2020/profile/settings/name-website-logo.blade.php +++ b/resources/views/portal/ninja2020/profile/settings/name-website-logo.blade.php @@ -31,7 +31,10 @@ @enderror
- +
+ + E.g. https://invoiceninja.com +
@error('website')
From 168f08abba3cbfba1b014fb507c3225a42fd434d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Tue, 2 Mar 2021 16:24:15 +0100 Subject: [PATCH 13/17] Credits table: Public notes -> Notes --- .../ninja2020/components/livewire/credits-table.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/portal/ninja2020/components/livewire/credits-table.blade.php b/resources/views/portal/ninja2020/components/livewire/credits-table.blade.php index 227721279305..adabe69366cc 100644 --- a/resources/views/portal/ninja2020/components/livewire/credits-table.blade.php +++ b/resources/views/portal/ninja2020/components/livewire/credits-table.blade.php @@ -32,7 +32,7 @@ - {{ ctrans('texts.public_notes') }} + {{ ctrans('texts.notes') }} @@ -78,4 +78,4 @@ @endif {{ $credits->links('portal/ninja2020/vendor/pagination') }}
-
\ No newline at end of file +
From 4f95e39c28b4e053834196e74cfcef6b23e14d0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Tue, 2 Mar 2021 16:27:06 +0100 Subject: [PATCH 14/17] Credits table: Add credit number column --- .../ninja2020/components/livewire/credits-table.blade.php | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/resources/views/portal/ninja2020/components/livewire/credits-table.blade.php b/resources/views/portal/ninja2020/components/livewire/credits-table.blade.php index adabe69366cc..e2ae75bafb0f 100644 --- a/resources/views/portal/ninja2020/components/livewire/credits-table.blade.php +++ b/resources/views/portal/ninja2020/components/livewire/credits-table.blade.php @@ -15,6 +15,11 @@ + @forelse($credits as $credit) + From 51be97d981f491db377ab5c7c16925e1298bc3c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Tue, 2 Mar 2021 16:29:24 +0100 Subject: [PATCH 15/17] - Quotes: Waiting for approval -> Pending Approval - Quotes: Remove superfluous text under Waiting for approval --- resources/lang/en/texts.php | 2 ++ .../ninja2020/quotes/includes/actions.blade.php | 13 +++---------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php index 1be12e4b0138..d669a3749807 100644 --- a/resources/lang/en/texts.php +++ b/resources/lang/en/texts.php @@ -4146,6 +4146,8 @@ $LANG = array( 'click_agree_to_accept_terms' => 'Click "Agree" to Accept Terms.', 'agree' => 'Agree', + + 'pending_approval' => 'Pending Approval', ); return $LANG; diff --git a/resources/views/portal/ninja2020/quotes/includes/actions.blade.php b/resources/views/portal/ninja2020/quotes/includes/actions.blade.php index d3c800ddc0ac..bc49946a1c29 100644 --- a/resources/views/portal/ninja2020/quotes/includes/actions.blade.php +++ b/resources/views/portal/ninja2020/quotes/includes/actions.blade.php @@ -7,16 +7,9 @@
-
-

- {{ ctrans('texts.waiting_for_approval') }} -

-
-

- {{ ctrans('texts.quote_still_not_approved') }} -

-
-
+

+ {{ ctrans('texts.pending_approval') }} +

@yield('quote-not-approved-right-side') From 9b227010b27b2f1daaa525c63a55e5688f6d2acd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Tue, 2 Mar 2021 18:29:44 +0100 Subject: [PATCH 16/17] Quotes: Remove "drafts" --- .../ninja2020/components/livewire/quotes-table.blade.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/resources/views/portal/ninja2020/components/livewire/quotes-table.blade.php b/resources/views/portal/ninja2020/components/livewire/quotes-table.blade.php index 92d165ec841e..b827cdfcc8bf 100644 --- a/resources/views/portal/ninja2020/components/livewire/quotes-table.blade.php +++ b/resources/views/portal/ninja2020/components/livewire/quotes-table.blade.php @@ -10,10 +10,6 @@
-
- - -
From dd71f28f87c131297757f7e82bf9f44a497809f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Beganovi=C4=87?= Date: Tue, 2 Mar 2021 18:30:44 +0100 Subject: [PATCH 17/17] Invoices: Removed superfluous text under the invoice number --- resources/views/portal/ninja2020/invoices/show.blade.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/resources/views/portal/ninja2020/invoices/show.blade.php b/resources/views/portal/ninja2020/invoices/show.blade.php index c86ecfd388e7..ee02248dbb31 100644 --- a/resources/views/portal/ninja2020/invoices/show.blade.php +++ b/resources/views/portal/ninja2020/invoices/show.blade.php @@ -38,12 +38,6 @@ {{ ctrans('texts.invoice_number_placeholder', ['invoice' => $invoice->number])}} - {{ ctrans('texts.unpaid') }} -
-

- {{ ctrans('texts.invoice_still_unpaid') }} - -

-
+ + {{ ctrans('texts.credit_number') }} + + {{ ctrans('texts.amount') }} @@ -41,6 +46,9 @@
+ {{ $credit->number }} + {{ App\Utils\Number::formatMoney($credit->amount, $credit->client) }}