From 18758214f120d667cf216f1d61fd785340cc87c3 Mon Sep 17 00:00:00 2001 From: Ikko Eltociear Ashimine Date: Wed, 18 Sep 2024 17:36:08 +0900 Subject: [PATCH 01/59] chore: update Attachment.php retreive -> retrieve --- packages/Webkul/Email/src/Helpers/Attachment.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/Webkul/Email/src/Helpers/Attachment.php b/packages/Webkul/Email/src/Helpers/Attachment.php index b55a09007..3731f4c7f 100644 --- a/packages/Webkul/Email/src/Helpers/Attachment.php +++ b/packages/Webkul/Email/src/Helpers/Attachment.php @@ -92,7 +92,7 @@ public function read($bytes = 2082) /** * Retrieve the file content in one go - * Once you retreive the content you cannot use MimeMailParser_attachment::read() + * Once you retrieve the content you cannot use MimeMailParser_attachment::read() * * @return string */ From fbd24213a8d7045f88bee76ac9aebe50851ea097 Mon Sep 17 00:00:00 2001 From: diepdp Date: Wed, 18 Sep 2024 16:09:18 +0700 Subject: [PATCH 02/59] fix: lead webform missing attributes when lead toggle is disabled Fixes #1614 - Ensure attribute options are visible when creating lead webforms --- .../views/settings/web-forms/create.blade.php | 46 +++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/packages/Webkul/Admin/src/Resources/views/settings/web-forms/create.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/web-forms/create.blade.php index 3f0e3012f..a4e9aa948 100644 --- a/packages/Webkul/Admin/src/Resources/views/settings/web-forms/create.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/settings/web-forms/create.blade.php @@ -16,12 +16,12 @@ {!! view_render_event('admin.settings.webform.create.breadcrumbs.after') !!} - +
@lang('admin::app.settings.webforms.create.title')
- +
{!! view_render_event('admin.settings.webform.create.save_button.before') !!} @@ -44,7 +44,7 @@ class="primary-button" @pushOnce('scripts') - @@ -549,10 +549,10 @@ class="!h-10 !w-12 rounded-l-none p-1 dark:border-gray-800 dark:bg-gray-900" watch: { /** * Watch for the createLead value and remove the added attributes if the value is true. - * + * * @param {Boolean} newValue * @param {Boolean} oldValue - * + * * @return {void} */ createLead(newValue, oldValue) { @@ -567,7 +567,7 @@ class="!h-10 !w-12 rounded-l-none p-1 dark:border-gray-800 dark:bg-gray-900" computed:{ /** * Get the placeholder value based on the submit success action value. - * + * * @return {String} */ placeholder() { @@ -576,7 +576,7 @@ class="!h-10 !w-12 rounded-l-none p-1 dark:border-gray-800 dark:bg-gray-900" /** * Get the grouped attributes based on the entity type. - * + * * @return {Object} */ groupedAttributes() { @@ -601,9 +601,9 @@ class="!h-10 !w-12 rounded-l-none p-1 dark:border-gray-800 dark:bg-gray-900" methods: { /** * Add the attribute to the added attributes list. - * + * * @param {Object} attribute - * + * * @return {void} */ addAttribute(attribute) { @@ -622,9 +622,9 @@ class="!h-10 !w-12 rounded-l-none p-1 dark:border-gray-800 dark:bg-gray-900" /** * Remove the attribute from the added attributes list. - * + * * @param {Object} attribute - * + * * @return {void} */ removeAttribute(attribute) { @@ -638,9 +638,9 @@ class="!h-10 !w-12 rounded-l-none p-1 dark:border-gray-800 dark:bg-gray-900" /** * Get the placeholder value based on the attribute type. - * + * * @param {Object} attribute - * + * * @return {String} */ getPlaceholderValue(attribute) { From a797a3e1b6b01943c6bac29e427197321ea71a6d Mon Sep 17 00:00:00 2001 From: Jitendra Singh <39991107+jitendra-webkul@users.noreply.github.com> Date: Thu, 19 Sep 2024 12:53:08 +0530 Subject: [PATCH 03/59] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 8a84e5ef9..e282e45e9 100644 --- a/README.md +++ b/README.md @@ -123,8 +123,8 @@ password:admin123 ### License -Krayin CRM is a truly opensource CRM framework which will always be free under the [MIT License](https://github.com/krayin/laravel-crm/blob/master/LICENSE). +Krayin CRM is a truly opensource CRM framework which will always be free under the [OSL-3.0 License](https://github.com/krayin/laravel-crm/blob/master/LICENSE.txt). ### Security Vulnerabilities -Please don't disclose security vulnerabilities publicly. If you find any security vulnerability in Krayin CRM then please email us: mailto:sales@krayincrm.com. +Please don't disclose security vulnerabilities publicly. If you find any security vulnerability in Krayin CRM then please email us: sales@krayincrm.com. From 8df1fd12d1eec4cef8a62fee5870f2a7a1d57add Mon Sep 17 00:00:00 2001 From: suraj kashyap Date: Thu, 19 Sep 2024 15:53:53 +0530 Subject: [PATCH 04/59] issue #1611 fixed. --- .env.example | 1 + .../src/Resources/views/quotes/pdf.blade.php | 107 +++++------------- 2 files changed, 29 insertions(+), 79 deletions(-) diff --git a/.env.example b/.env.example index 5f172ce5d..5bae4cc41 100644 --- a/.env.example +++ b/.env.example @@ -5,6 +5,7 @@ APP_DEBUG=true APP_URL=http://localhost APP_TIMEZONE=Asia/Kolkata APP_LOCALE=en +APP_CURRENCY=USD VITE_HOST= VITE_PORT= diff --git a/packages/Webkul/Admin/src/Resources/views/quotes/pdf.blade.php b/packages/Webkul/Admin/src/Resources/views/quotes/pdf.blade.php index b73dd8f64..2aeadbce2 100755 --- a/packages/Webkul/Admin/src/Resources/views/quotes/pdf.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/quotes/pdf.blade.php @@ -1,94 +1,43 @@ - - + - @php - $fontPath = []; - - $fontFamily = [ - 'regular' => 'Arial, sans-serif', - 'bold' => 'Arial, sans-serif', - ]; + - if (in_array(app()->getLocale(), ['ar', 'he', 'fa', 'tr', 'ru', 'uk'])) { + @php + if ($locale == 'en') { $fontFamily = [ 'regular' => 'DejaVu Sans', 'bold' => 'DejaVu Sans', ]; - } elseif (app()->getLocale() == 'zh_CN') { - $fontPath = [ - 'regular' => asset('fonts/NotoSansSC-Regular.ttf'), - 'bold' => asset('fonts/NotoSansSC-Bold.ttf'), - ]; - - $fontFamily = [ - 'regular' => 'Noto Sans SC', - 'bold' => 'Noto Sans SC Bold', - ]; - } elseif (app()->getLocale() == 'ja') { - $fontPath = [ - 'regular' => asset('fonts/NotoSansJP-Regular.ttf'), - 'bold' => asset('fonts/NotoSansJP-Bold.ttf'), - ]; - - $fontFamily = [ - 'regular' => 'Noto Sans JP', - 'bold' => 'Noto Sans JP Bold', - ]; - } elseif (app()->getLocale() == 'hi_IN') { - $fontPath = [ - 'regular' => asset('fonts/Hind-Regular.ttf'), - 'bold' => asset('fonts/Hind-Bold.ttf'), - ]; - + } else { $fontFamily = [ - 'regular' => 'Hind', - 'bold' => 'Hind Bold', + 'regular' => 'Arial, sans-serif', + 'bold' => 'Arial, sans-serif', ]; - } elseif (app()->getLocale() == 'bn') { - $fontPath = [ - 'regular' => asset('fonts/NotoSansBengali-Regular.ttf'), - 'bold' => asset('fonts/NotoSansBengali-Bold.ttf'), - ]; - - $fontFamily = [ - 'regular' => 'Noto Sans Bengali', - 'bold' => 'Noto Sans Bengali Bold', - ]; - } elseif (app()->getLocale() == 'sin') { - $fontPath = [ - 'regular' => asset('fonts/NotoSansSinhala-Regular.ttf'), - 'bold' => asset('fonts/NotoSansSinhala-Bold.ttf'), - ]; - + } + + if (in_array($locale, ['ar', 'fa', 'tr'])) { $fontFamily = [ - 'regular' => 'Noto Sans Sinhala', - 'bold' => 'Noto Sans Sinhala Bold', + 'regular' => 'DejaVu Sans', + 'bold' => 'DejaVu Sans', ]; } @endphp - +