From d1c83d65cf21dee52ffd546c17b67bddfef456a4 Mon Sep 17 00:00:00 2001 From: devansh bawari Date: Fri, 8 Jan 2021 11:19:46 +0530 Subject: [PATCH 1/8] Fallback Added --- .../Resources/views/settings/channels/edit.blade.php | 12 ++++++------ .../Shop/src/Resources/views/home/index.blade.php | 8 +++++++- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/packages/Webkul/Admin/src/Resources/views/settings/channels/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/channels/edit.blade.php index 1319ce353..c6445c776 100755 --- a/packages/Webkul/Admin/src/Resources/views/settings/channels/edit.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/settings/channels/edit.blade.php @@ -61,7 +61,7 @@ {{ __('admin::app.settings.channels.name') }} [{{ $locale }}] - + @{{ errors.first('{!!$locale!!}[page_title]') }} @@ -70,7 +70,7 @@ {{ __('admin::app.settings.channels.description') }} [{{ $locale }}] - +
@@ -190,7 +190,7 @@ {{ __('admin::app.settings.channels.home_page_content') }} [{{ $locale }}] - +
@@ -198,7 +198,7 @@ {{ __('admin::app.settings.channels.footer_content') }} [{{ $locale }}] - +
@@ -217,7 +217,7 @@ @php - $home_seo = $channel->translate($locale)['home_seo'] ?? '{}'; + $home_seo = $channel->translate($locale)['home_seo'] ?? $channel->home_seo; $seo = json_decode($home_seo); @endphp @@ -276,7 +276,7 @@ {{ __('admin::app.settings.channels.maintenance-mode-text') }} [{{ $locale }}] - +
diff --git a/packages/Webkul/Shop/src/Resources/views/home/index.blade.php b/packages/Webkul/Shop/src/Resources/views/home/index.blade.php index f25365260..b3021bcf3 100755 --- a/packages/Webkul/Shop/src/Resources/views/home/index.blade.php +++ b/packages/Webkul/Shop/src/Resources/views/home/index.blade.php @@ -40,7 +40,13 @@ @section('content-wrapper') {!! view_render_event('bagisto.shop.home.content.before') !!} - {!! DbView::make($channel)->field('home_page_content')->with(['sliderData' => $sliderData])->render() !!} + @if (! is_null($channel->home_page_content)) + {!! DbView::make($channel)->field('home_page_content')->with(['sliderData' => $sliderData])->render() !!} + @else + @include('shop::home.slider', ['sliderData' => $sliderData]) + @include('shop::home.featured-products') + @include('shop::home.new-products') + @endif {{ view_render_event('bagisto.shop.home.content.after') }} From ca1f67df2ed483a7964bd70eda3d10914c2fe030 Mon Sep 17 00:00:00 2001 From: devansh bawari Date: Fri, 8 Jan 2021 19:12:19 +0530 Subject: [PATCH 2/8] Filters Added --- packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php | 4 ++++ packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php | 1 + packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php | 1 + 3 files changed, 6 insertions(+) diff --git a/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php b/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php index cf46f2b9b..3c410a475 100755 --- a/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/AttributeDataGrid.php @@ -17,6 +17,10 @@ class AttributeDataGrid extends DataGrid ->select('id') ->addSelect('id', 'code', 'admin_name', 'type', 'is_required', 'is_unique', 'value_per_locale', 'value_per_channel'); + $this->addFilter('is_unique', 'is_unique'); + $this->addFilter('value_per_locale', 'value_per_locale'); + $this->addFilter('value_per_channel', 'value_per_channel'); + $this->setQueryBuilder($queryBuilder); } diff --git a/packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php index b6e7237ab..1d4ce5acf 100755 --- a/packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CategoryDataGrid.php @@ -24,6 +24,7 @@ class CategoryDataGrid extends DataGrid ->groupBy('cat.id'); + $this->addFilter('status', 'cat.status'); $this->addFilter('category_id', 'cat.id'); $this->setQueryBuilder($queryBuilder); diff --git a/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php index 2af7c38e7..b18a6686e 100755 --- a/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CustomerDataGrid.php @@ -24,6 +24,7 @@ class CustomerDataGrid extends DataGrid $this->addFilter('full_name', DB::raw('CONCAT(' . DB::getTablePrefix() . 'customers.first_name, " ", ' . DB::getTablePrefix() . 'customers.last_name)')); $this->addFilter('phone', 'customers.phone'); $this->addFilter('gender', 'customers.gender'); + $this->addFilter('status', 'status'); $this->setQueryBuilder($queryBuilder); } From 71abe8f4ca3cce432308a7d8e720177088f23f76 Mon Sep 17 00:00:00 2001 From: devansh bawari Date: Fri, 8 Jan 2021 20:23:01 +0530 Subject: [PATCH 3/8] Arabic And Persian Support Added To DOM PDF --- composer.json | 1 + composer.lock | 1522 +---------------- .../Controllers/Sales/InvoiceController.php | 28 +- 3 files changed, 75 insertions(+), 1476 deletions(-) diff --git a/composer.json b/composer.json index dc64a55af..301cddfcf 100755 --- a/composer.json +++ b/composer.json @@ -33,6 +33,7 @@ "intervention/image": "^2.4", "intervention/imagecache": "^2.3", "kalnoy/nestedset": "5.0.1", + "khaled.alshamaa/ar-php": "^5.5", "konekt/concord": "^1.2", "laravel/framework": "^7.0", "laravel/scout": "^8.0", diff --git a/composer.lock b/composer.lock index 367169b8b..d2bc644f0 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "60d4ebe6f1f391967ac8ab70925d01ef", + "content-hash": "d39b20d883becc503d8a843726499b15", "packages": [ { "name": "algolia/algoliasearch-client-php", @@ -74,10 +74,6 @@ "php", "search" ], - "support": { - "issues": "https://github.com/algolia/algoliasearch-client-php/issues", - "source": "https://github.com/algolia/algoliasearch-client-php/tree/2.7.3" - }, "time": "2020-12-22T11:27:03+00:00" }, { @@ -143,26 +139,6 @@ "laravel", "translation" ], - "support": { - "docs": "https://docs.astrotomic.info/laravel-translatable", - "email": "dev@astrotomic.info", - "issues": "https://github.com/Astrotomic/laravel-translatable/issues", - "source": "https://github.com/Astrotomic/laravel-translatable" - }, - "funding": [ - { - "url": "https://offset.earth/treeware", - "type": "custom" - }, - { - "url": "https://github.com/Gummibeer", - "type": "github" - }, - { - "url": "https://issuehunt.io/r/astrotomic", - "type": "issuehunt" - } - ], "time": "2020-11-19T14:10:38+00:00" }, { @@ -248,11 +224,6 @@ "s3", "sdk" ], - "support": { - "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80", - "issues": "https://github.com/aws/aws-sdk-php/issues", - "source": "https://github.com/aws/aws-sdk-php/tree/3.171.10" - }, "time": "2020-12-31T19:13:37+00:00" }, { @@ -302,10 +273,6 @@ "elasticsearch", "php" ], - "support": { - "issues": "https://github.com/babenkoivan/elastic-adapter/issues", - "source": "https://github.com/babenkoivan/elastic-adapter/tree/v1.9.0" - }, "time": "2020-11-14T15:09:00+00:00" }, { @@ -363,10 +330,6 @@ "laravel", "php" ], - "support": { - "issues": "https://github.com/babenkoivan/elastic-client/issues", - "source": "https://github.com/babenkoivan/elastic-client/tree/ci-improvements" - }, "time": "2020-07-09T10:19:44+00:00" }, { @@ -428,10 +391,6 @@ "php", "scout" ], - "support": { - "issues": "https://github.com/babenkoivan/elastic-scout-driver/issues", - "source": "https://github.com/babenkoivan/elastic-scout-driver/tree/v1.2.1" - }, "time": "2020-12-10T15:10:19+00:00" }, { @@ -448,7 +407,6 @@ "reference": "0b545b26ab47941dbdd319e9222404603a9b8de6", "shasum": "" }, - "default-branch": true, "type": "library", "extra": { "laravel": { @@ -474,10 +432,6 @@ } ], "description": "Bagisto Package Generator", - "support": { - "issues": "https://github.com/bagisto/bagisto-package-generator/issues", - "source": "https://github.com/bagisto/bagisto-package-generator/tree/master" - }, "time": "2020-08-24T08:41:44+00:00" }, { @@ -518,10 +472,6 @@ "email": "contato@carlosgartner.com.br" } ], - "support": { - "issues": "https://github.com/bagistobrasil/bagisto-product-social-share/issues", - "source": "https://github.com/bagistobrasil/bagisto-product-social-share/tree/0.1.2" - }, "time": "2020-08-04T12:36:28+00:00" }, { @@ -592,16 +542,6 @@ "profiler", "webprofiler" ], - "support": { - "issues": "https://github.com/barryvdh/laravel-debugbar/issues", - "source": "https://github.com/barryvdh/laravel-debugbar/tree/v3.5.1" - }, - "funding": [ - { - "url": "https://github.com/barryvdh", - "type": "github" - } - ], "time": "2020-09-07T19:32:39+00:00" }, { @@ -658,10 +598,6 @@ "laravel", "pdf" ], - "support": { - "issues": "https://github.com/barryvdh/laravel-dompdf/issues", - "source": "https://github.com/barryvdh/laravel-dompdf/tree/v0.8.6" - }, "time": "2020-02-25T20:44:34+00:00" }, { @@ -708,16 +644,6 @@ "brick", "math" ], - "support": { - "issues": "https://github.com/brick/math/issues", - "source": "https://github.com/brick/math/tree/master" - }, - "funding": [ - { - "url": "https://tidelift.com/funding/github/packagist/brick/math", - "type": "tidelift" - } - ], "time": "2020-08-18T23:57:15+00:00" }, { @@ -751,10 +677,6 @@ "MIT" ], "description": "implementation of xdg base directory specification for php", - "support": { - "issues": "https://github.com/dnoegel/php-xdg-base-dir/issues", - "source": "https://github.com/dnoegel/php-xdg-base-dir/tree/v0.1.1" - }, "time": "2019-12-04T15:06:13+00:00" }, { @@ -837,24 +759,6 @@ "redis", "xcache" ], - "support": { - "issues": "https://github.com/doctrine/cache/issues", - "source": "https://github.com/doctrine/cache/tree/1.10.x" - }, - "funding": [ - { - "url": "https://www.doctrine-project.org/sponsorship.html", - "type": "custom" - }, - { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fcache", - "type": "tidelift" - } - ], "time": "2020-07-07T18:54:01+00:00" }, { @@ -937,10 +841,6 @@ "php", "queryobject" ], - "support": { - "issues": "https://github.com/doctrine/dbal/issues", - "source": "https://github.com/doctrine/dbal/tree/2.9" - }, "time": "2018-12-31T03:27:51+00:00" }, { @@ -1017,24 +917,6 @@ "event system", "events" ], - "support": { - "issues": "https://github.com/doctrine/event-manager/issues", - "source": "https://github.com/doctrine/event-manager/tree/1.1.x" - }, - "funding": [ - { - "url": "https://www.doctrine-project.org/sponsorship.html", - "type": "custom" - }, - { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Fevent-manager", - "type": "tidelift" - } - ], "time": "2020-05-29T18:28:51+00:00" }, { @@ -1112,24 +994,6 @@ "uppercase", "words" ], - "support": { - "issues": "https://github.com/doctrine/inflector/issues", - "source": "https://github.com/doctrine/inflector/tree/2.0.x" - }, - "funding": [ - { - "url": "https://www.doctrine-project.org/sponsorship.html", - "type": "custom" - }, - { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finflector", - "type": "tidelift" - } - ], "time": "2020-05-29T15:13:26+00:00" }, { @@ -1192,24 +1056,6 @@ "parser", "php" ], - "support": { - "issues": "https://github.com/doctrine/lexer/issues", - "source": "https://github.com/doctrine/lexer/tree/1.2.1" - }, - "funding": [ - { - "url": "https://www.doctrine-project.org/sponsorship.html", - "type": "custom" - }, - { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Flexer", - "type": "tidelift" - } - ], "time": "2020-05-25T17:44:05+00:00" }, { @@ -1278,10 +1124,6 @@ ], "description": "DOMPDF is a CSS 2.1 compliant HTML to PDF converter", "homepage": "https://github.com/dompdf/dompdf", - "support": { - "issues": "https://github.com/dompdf/dompdf/issues", - "source": "https://github.com/dompdf/dompdf/tree/master" - }, "time": "2020-08-30T22:54:22+00:00" }, { @@ -1336,16 +1178,6 @@ "cron", "schedule" ], - "support": { - "issues": "https://github.com/dragonmantank/cron-expression/issues", - "source": "https://github.com/dragonmantank/cron-expression/tree/v2.3.1" - }, - "funding": [ - { - "url": "https://github.com/dragonmantank", - "type": "github" - } - ], "time": "2020-10-13T00:52:37+00:00" }, { @@ -1404,16 +1236,6 @@ "validation", "validator" ], - "support": { - "issues": "https://github.com/egulias/EmailValidator/issues", - "source": "https://github.com/egulias/EmailValidator/tree/2.1.25" - }, - "funding": [ - { - "url": "https://github.com/egulias", - "type": "github" - } - ], "time": "2020-12-29T14:50:06+00:00" }, { @@ -1479,10 +1301,6 @@ "elasticsearch", "search" ], - "support": { - "issues": "https://github.com/elastic/elasticsearch-php/issues", - "source": "https://github.com/elastic/elasticsearch-php/tree/v7.10.0" - }, "time": "2020-11-11T16:31:00+00:00" }, { @@ -1533,9 +1351,6 @@ "Guzzle", "stream" ], - "support": { - "source": "https://github.com/ezimuel/guzzlestreams/tree/3.0.1" - }, "time": "2020-02-14T23:11:50+00:00" }, { @@ -1587,9 +1402,6 @@ } ], "description": "Fork of guzzle/RingPHP (abandoned) to be used with elasticsearch-php", - "support": { - "source": "https://github.com/ezimuel/ringphp/tree/1.1.2" - }, "time": "2020-02-14T23:51:21+00:00" }, { @@ -1640,10 +1452,6 @@ "keywords": [ "html" ], - "support": { - "issues": "https://github.com/ezyang/htmlpurifier/issues", - "source": "https://github.com/ezyang/htmlpurifier/tree/master" - }, "time": "2020-06-29T00:56:53+00:00" }, { @@ -1698,10 +1506,6 @@ "proxy", "trusted proxy" ], - "support": { - "issues": "https://github.com/fideloper/TrustedProxy/issues", - "source": "https://github.com/fideloper/TrustedProxy/tree/4.4.1" - }, "time": "2020-10-22T13:48:01+00:00" }, { @@ -1760,10 +1564,6 @@ "laravel", "model" ], - "support": { - "issues": "https://github.com/Flynsarmy/laravel-db-blade-compiler/issues", - "source": "https://github.com/Flynsarmy/laravel-db-blade-compiler/tree/5.5.0" - }, "time": "2019-07-28T22:19:29+00:00" }, { @@ -1814,10 +1614,6 @@ "faker", "fixtures" ], - "support": { - "issues": "https://github.com/fzaninotto/Faker/issues", - "source": "https://github.com/fzaninotto/Faker/tree/v1.9.2" - }, "abandoned": true, "time": "2020-12-11T09:56:16+00:00" }, @@ -1886,10 +1682,6 @@ "rest", "web service" ], - "support": { - "issues": "https://github.com/guzzle/guzzle/issues", - "source": "https://github.com/guzzle/guzzle/tree/6.5" - }, "time": "2020-06-16T21:01:06+00:00" }, { @@ -1941,10 +1733,6 @@ "keywords": [ "promise" ], - "support": { - "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/1.4.0" - }, "time": "2020-09-30T07:37:28+00:00" }, { @@ -2016,10 +1804,6 @@ "uri", "url" ], - "support": { - "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/1.7.0" - }, "time": "2020-09-30T07:37:11+00:00" }, { @@ -2090,10 +1874,6 @@ "thumbnail", "watermark" ], - "support": { - "issues": "https://github.com/Intervention/image/issues", - "source": "https://github.com/Intervention/image/tree/master" - }, "time": "2019-11-02T09:15:47+00:00" }, { @@ -2147,20 +1927,6 @@ "imagick", "laravel" ], - "support": { - "issues": "https://github.com/Intervention/imagecache/issues", - "source": "https://github.com/Intervention/imagecache/tree/2.5.1" - }, - "funding": [ - { - "url": "https://www.paypal.me/interventionphp", - "type": "custom" - }, - { - "url": "https://github.com/Intervention", - "type": "github" - } - ], "time": "2020-12-07T15:07:18+00:00" }, { @@ -2220,12 +1986,55 @@ "nested sets", "nsm" ], - "support": { - "issues": "https://github.com/lazychaser/laravel-nestedset/issues", - "source": "https://github.com/lazychaser/laravel-nestedset/tree/v5" - }, "time": "2020-03-04T05:33:20+00:00" }, + { + "name": "khaled.alshamaa/ar-php", + "version": "v5.5.1", + "source": { + "type": "git", + "url": "https://github.com/khaled-alshamaa/ar-php.git", + "reference": "4f0ee584107fa164f6311f9874360ef2c4f195f9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/khaled-alshamaa/ar-php/zipball/4f0ee584107fa164f6311f9874360ef2c4f195f9", + "reference": "4f0ee584107fa164f6311f9874360ef2c4f195f9", + "shasum": "" + }, + "require": { + "ext-mbstring": "*", + "php": ">=5.6.0" + }, + "require-dev": { + "phpunit/phpunit": "9.*" + }, + "type": "library", + "autoload": { + "psr-4": { + "ArPHP\\I18N\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "LGPL-3.0" + ], + "authors": [ + { + "name": "Khaled Al-Sham'aa", + "email": "khaled@ar-php.org", + "homepage": "http://www.ar-php.org" + } + ], + "description": "Set of functionalities enable Arabic website developers to serve professional search, present and process Arabic content in PHP", + "homepage": "https://github.com/khaled-alshamaa/ar-php", + "keywords": [ + "arabic", + "hijri", + "islamic" + ], + "time": "2020-12-18T18:54:56+00:00" + }, { "name": "konekt/concord", "version": "1.10.0", @@ -2282,10 +2091,6 @@ } ], "description": "Concord is a Laravel Extension for building modular Laravel Applications", - "support": { - "issues": "https://github.com/artkonekt/concord", - "source": "https://github.com/artkonekt/concord/tree/1.10.0" - }, "time": "2020-12-08T20:50:01+00:00" }, { @@ -2330,10 +2135,6 @@ "enum", "konekt" ], - "support": { - "issues": "https://github.com/artkonekt/enum/issues", - "source": "https://github.com/artkonekt/enum" - }, "time": "2020-11-28T21:37:27+00:00" }, { @@ -2398,10 +2199,6 @@ "konekt", "laravel" ], - "support": { - "issues": "https://github.com/artkonekt/enum-eloquent/issues", - "source": "https://github.com/artkonekt/enum-eloquent" - }, "time": "2020-11-28T22:13:08+00:00" }, { @@ -2560,10 +2357,6 @@ "framework", "laravel" ], - "support": { - "issues": "https://github.com/laravel/framework/issues", - "source": "https://github.com/laravel/framework" - }, "time": "2020-12-22T17:00:45+00:00" }, { @@ -2629,10 +2422,6 @@ "laravel", "search" ], - "support": { - "issues": "https://github.com/laravel/scout/issues", - "source": "https://github.com/laravel/scout" - }, "time": "2020-12-30T15:52:14+00:00" }, { @@ -2698,10 +2487,6 @@ "laravel", "oauth" ], - "support": { - "issues": "https://github.com/laravel/socialite/issues", - "source": "https://github.com/laravel/socialite" - }, "time": "2020-06-03T13:30:03+00:00" }, { @@ -2766,10 +2551,6 @@ "laravel", "psysh" ], - "support": { - "issues": "https://github.com/laravel/tinker/issues", - "source": "https://github.com/laravel/tinker/tree/v2.5.0" - }, "time": "2020-10-29T13:07:12+00:00" }, { @@ -2821,10 +2602,6 @@ "laravel", "ui" ], - "support": { - "issues": "https://github.com/laravel/ui/issues", - "source": "https://github.com/laravel/ui/tree/v2.5.0" - }, "time": "2020-11-03T19:45:19+00:00" }, { @@ -2880,20 +2657,6 @@ "JWS", "jwt" ], - "support": { - "issues": "https://github.com/lcobucci/jwt/issues", - "source": "https://github.com/lcobucci/jwt/tree/3.3.3" - }, - "funding": [ - { - "url": "https://github.com/lcobucci", - "type": "github" - }, - { - "url": "https://www.patreon.com/lcobucci", - "type": "patreon" - } - ], "time": "2020-08-20T13:22:28+00:00" }, { @@ -2963,38 +2726,6 @@ "md", "parser" ], - "support": { - "docs": "https://commonmark.thephpleague.com/", - "issues": "https://github.com/thephpleague/commonmark/issues", - "rss": "https://github.com/thephpleague/commonmark/releases.atom", - "source": "https://github.com/thephpleague/commonmark" - }, - "funding": [ - { - "url": "https://enjoy.gitstore.app/repositories/thephpleague/commonmark", - "type": "custom" - }, - { - "url": "https://www.colinodell.com/sponsor", - "type": "custom" - }, - { - "url": "https://www.paypal.me/colinpodell/10.00", - "type": "custom" - }, - { - "url": "https://github.com/colinodell", - "type": "github" - }, - { - "url": "https://www.patreon.com/colinodell", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/league/commonmark", - "type": "tidelift" - } - ], "time": "2020-10-31T13:49:32+00:00" }, { @@ -3080,16 +2811,6 @@ "sftp", "storage" ], - "support": { - "issues": "https://github.com/thephpleague/flysystem/issues", - "source": "https://github.com/thephpleague/flysystem/tree/1.x" - }, - "funding": [ - { - "url": "https://offset.earth/frankdejonge", - "type": "other" - } - ], "time": "2020-08-23T07:39:11+00:00" }, { @@ -3131,20 +2852,6 @@ } ], "description": "Mime-type detection for Flysystem", - "support": { - "issues": "https://github.com/thephpleague/mime-type-detection/issues", - "source": "https://github.com/thephpleague/mime-type-detection/tree/1.5.1" - }, - "funding": [ - { - "url": "https://github.com/frankdejonge", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/league/flysystem", - "type": "tidelift" - } - ], "time": "2020-10-18T11:50:25+00:00" }, { @@ -3216,10 +2923,6 @@ "tumblr", "twitter" ], - "support": { - "issues": "https://github.com/thephpleague/oauth1-client/issues", - "source": "https://github.com/thephpleague/oauth1-client/tree/v1.8.2" - }, "time": "2020-09-28T09:39:08+00:00" }, { @@ -3287,20 +2990,6 @@ "php", "phpspreadsheet" ], - "support": { - "issues": "https://github.com/Maatwebsite/Laravel-Excel/issues", - "source": "https://github.com/Maatwebsite/Laravel-Excel/tree/3.1" - }, - "funding": [ - { - "url": "https://laravel-excel.com/commercial-support", - "type": "custom" - }, - { - "url": "https://github.com/patrickbrouwers", - "type": "github" - } - ], "time": "2020-02-28T15:47:45+00:00" }, { @@ -3362,16 +3051,6 @@ "stream", "zip" ], - "support": { - "issues": "https://github.com/maennchen/ZipStream-PHP/issues", - "source": "https://github.com/maennchen/ZipStream-PHP/tree/master" - }, - "funding": [ - { - "url": "https://opencollective.com/zipstream", - "type": "open_collective" - } - ], "time": "2020-05-30T13:11:16+00:00" }, { @@ -3467,10 +3146,6 @@ "complex", "mathematics" ], - "support": { - "issues": "https://github.com/MarkBaker/PHPComplex/issues", - "source": "https://github.com/MarkBaker/PHPComplex/tree/PHP8" - }, "time": "2020-08-26T10:42:07+00:00" }, { @@ -3541,10 +3216,6 @@ "matrix", "vector" ], - "support": { - "issues": "https://github.com/MarkBaker/PHPMatrix/issues", - "source": "https://github.com/MarkBaker/PHPMatrix/tree/PHP8" - }, "time": "2020-08-28T17:11:00+00:00" }, { @@ -3606,10 +3277,6 @@ "debug", "debugbar" ], - "support": { - "issues": "https://github.com/maximebf/php-debugbar/issues", - "source": "https://github.com/maximebf/php-debugbar/tree/v1.16.4" - }, "time": "2020-12-07T10:48:48+00:00" }, { @@ -3692,20 +3359,6 @@ "logging", "psr-3" ], - "support": { - "issues": "https://github.com/Seldaek/monolog/issues", - "source": "https://github.com/Seldaek/monolog/tree/2.2.0" - }, - "funding": [ - { - "url": "https://github.com/Seldaek", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/monolog/monolog", - "type": "tidelift" - } - ], "time": "2020-12-14T13:15:25+00:00" }, { @@ -3763,10 +3416,6 @@ "json", "jsonpath" ], - "support": { - "issues": "https://github.com/jmespath/jmespath.php/issues", - "source": "https://github.com/jmespath/jmespath.php/tree/2.6.0" - }, "time": "2020-07-31T21:01:56+00:00" }, { @@ -3813,20 +3462,6 @@ "keywords": [ "enum" ], - "support": { - "issues": "https://github.com/myclabs/php-enum/issues", - "source": "https://github.com/myclabs/php-enum/tree/1.7.7" - }, - "funding": [ - { - "url": "https://github.com/mnapoli", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/myclabs/php-enum", - "type": "tidelift" - } - ], "time": "2020-11-14T18:14:52+00:00" }, { @@ -3890,10 +3525,6 @@ "jwt", "token" ], - "support": { - "issues": "https://github.com/namshi/jose/issues", - "source": "https://github.com/namshi/jose/tree/master" - }, "time": "2016-12-05T07:27:31+00:00" }, { @@ -3973,20 +3604,6 @@ "datetime", "time" ], - "support": { - "issues": "https://github.com/briannesbitt/Carbon/issues", - "source": "https://github.com/briannesbitt/Carbon" - }, - "funding": [ - { - "url": "https://opencollective.com/Carbon", - "type": "open_collective" - }, - { - "url": "https://tidelift.com/funding/github/packagist/nesbot/carbon", - "type": "tidelift" - } - ], "time": "2020-12-17T20:55:32+00:00" }, { @@ -4039,10 +3656,6 @@ "parser", "php" ], - "support": { - "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.10.4" - }, "time": "2020-12-20T10:01:03+00:00" }, { @@ -4104,10 +3717,6 @@ "serialization", "serialize" ], - "support": { - "issues": "https://github.com/opis/closure/issues", - "source": "https://github.com/opis/closure/tree/3.6.1" - }, "time": "2020-11-07T02:01:34+00:00" }, { @@ -4157,10 +3766,6 @@ "rest", "sdk" ], - "support": { - "issues": "https://github.com/paypal/Checkout-PHP-SDK/issues", - "source": "https://github.com/paypal/Checkout-PHP-SDK/tree/1.0.1" - }, "time": "2019-11-07T23:16:44+00:00" }, { @@ -4200,10 +3805,6 @@ "homepage": "https://github.com/paypal/paypalhttp_php/contributors" } ], - "support": { - "issues": "https://github.com/paypal/paypalhttp_php/issues", - "source": "https://github.com/paypal/paypalhttp_php/tree/1.0.0" - }, "abandoned": true, "time": "2019-11-06T21:27:12+00:00" }, @@ -4242,10 +3843,6 @@ ], "description": "A library to read, parse, export and make subsets of different types of font files.", "homepage": "https://github.com/PhenX/php-font-lib", - "support": { - "issues": "https://github.com/PhenX/php-font-lib/issues", - "source": "https://github.com/PhenX/php-font-lib/tree/0.5.2" - }, "time": "2020-03-08T15:31:32+00:00" }, { @@ -4286,10 +3883,6 @@ ], "description": "A library to read, parse and export to PDF SVG files.", "homepage": "https://github.com/PhenX/php-svg-lib", - "support": { - "issues": "https://github.com/PhenX/php-svg-lib/issues", - "source": "https://github.com/PhenX/php-svg-lib/tree/master" - }, "time": "2019-09-11T20:02:13+00:00" }, { @@ -4446,20 +4039,6 @@ "php", "type" ], - "support": { - "issues": "https://github.com/schmittjoh/php-option/issues", - "source": "https://github.com/schmittjoh/php-option/tree/1.7.5" - }, - "funding": [ - { - "url": "https://github.com/GrahamCampbell", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/phpoption/phpoption", - "type": "tidelift" - } - ], "time": "2020-07-20T17:29:33+00:00" }, { @@ -4526,13 +4105,6 @@ "model", "repository" ], - "support": { - "docs": "http://andersao.github.io/l5-repository", - "email": "contato@andersonandra.de", - "issues": "https://github.com/andersao/l5-repository/issues", - "source": "https://github.com/andersao/l5-repository", - "wiki": "https://github.com/andersao/l5-repository" - }, "time": "2020-12-20T00:46:52+00:00" }, { @@ -4576,13 +4148,6 @@ "service", "validation" ], - "support": { - "docs": "http://andersao.github.io/laravel-validation", - "email": "contato@andersonandra.de", - "issues": "https://github.com/andersao/laravel-validation/issues", - "source": "https://github.com/andersao/laravel-validation", - "wiki": "https://github.com/andersao/laravel-validation" - }, "time": "2020-09-21T20:20:45+00:00" }, { @@ -4632,10 +4197,6 @@ "container-interop", "psr" ], - "support": { - "issues": "https://github.com/php-fig/container/issues", - "source": "https://github.com/php-fig/container/tree/master" - }, "time": "2017-02-14T16:28:37+00:00" }, { @@ -4682,10 +4243,6 @@ "psr", "psr-14" ], - "support": { - "issues": "https://github.com/php-fig/event-dispatcher/issues", - "source": "https://github.com/php-fig/event-dispatcher/tree/1.0.0" - }, "time": "2019-01-08T18:20:26+00:00" }, { @@ -4735,9 +4292,6 @@ "psr", "psr-18" ], - "support": { - "source": "https://github.com/php-fig/http-client/tree/master" - }, "time": "2020-06-29T06:28:15+00:00" }, { @@ -4790,9 +4344,6 @@ "request", "response" ], - "support": { - "source": "https://github.com/php-fig/http-factory/tree/master" - }, "time": "2019-04-30T12:38:16+00:00" }, { @@ -4843,9 +4394,6 @@ "request", "response" ], - "support": { - "source": "https://github.com/php-fig/http-message/tree/master" - }, "time": "2016-08-06T14:39:51+00:00" }, { @@ -4893,9 +4441,6 @@ "psr", "psr-3" ], - "support": { - "source": "https://github.com/php-fig/log/tree/1.1.3" - }, "time": "2020-03-23T09:12:05+00:00" }, { @@ -4944,9 +4489,6 @@ "psr-16", "simple-cache" ], - "support": { - "source": "https://github.com/php-fig/simple-cache/tree/master" - }, "time": "2017-10-23T01:57:42+00:00" }, { @@ -5019,10 +4561,6 @@ "interactive", "shell" ], - "support": { - "issues": "https://github.com/bobthecow/psysh/issues", - "source": "https://github.com/bobthecow/psysh/tree/v0.10.5" - }, "time": "2020-12-04T02:51:30+00:00" }, { @@ -5063,10 +4601,6 @@ } ], "description": "A polyfill for getallheaders.", - "support": { - "issues": "https://github.com/ralouphie/getallheaders/issues", - "source": "https://github.com/ralouphie/getallheaders/tree/develop" - }, "time": "2019-03-08T08:55:37+00:00" }, { @@ -5130,16 +4664,6 @@ "queue", "set" ], - "support": { - "issues": "https://github.com/ramsey/collection/issues", - "source": "https://github.com/ramsey/collection/tree/1.1.1" - }, - "funding": [ - { - "url": "https://github.com/ramsey", - "type": "github" - } - ], "time": "2020-09-10T20:58:17+00:00" }, { @@ -5221,17 +4745,6 @@ "identifier", "uuid" ], - "support": { - "issues": "https://github.com/ramsey/uuid/issues", - "rss": "https://github.com/ramsey/uuid/releases.atom", - "source": "https://github.com/ramsey/uuid" - }, - "funding": [ - { - "url": "https://github.com/ramsey", - "type": "github" - } - ], "time": "2020-08-18T17:17:46+00:00" }, { @@ -5278,10 +4791,6 @@ "promise", "promises" ], - "support": { - "issues": "https://github.com/reactphp/promise/issues", - "source": "https://github.com/reactphp/promise/tree/v2.8.0" - }, "time": "2020-05-12T15:16:56+00:00" }, { @@ -5327,10 +4836,6 @@ "parser", "stylesheet" ], - "support": { - "issues": "https://github.com/sabberworm/PHP-CSS-Parser/issues", - "source": "https://github.com/sabberworm/PHP-CSS-Parser/tree/8.3.1" - }, "time": "2020-06-01T09:10:00+00:00" }, { @@ -5392,20 +4897,6 @@ "mail", "mailer" ], - "support": { - "issues": "https://github.com/swiftmailer/swiftmailer/issues", - "source": "https://github.com/swiftmailer/swiftmailer/tree/v6.2.4" - }, - "funding": [ - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/swiftmailer/swiftmailer", - "type": "tidelift" - } - ], "time": "2020-12-08T18:02:06+00:00" }, { @@ -5486,23 +4977,6 @@ "console", "terminal" ], - "support": { - "source": "https://github.com/symfony/console/tree/v5.2.1" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-12-18T08:03:05+00:00" }, { @@ -5551,23 +5025,6 @@ ], "description": "Symfony CssSelector Component", "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/css-selector/tree/v5.2.1" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-12-08T17:02:38+00:00" }, { @@ -5620,23 +5077,6 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/debug/tree/v4.4.18" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-12-10T16:34:26+00:00" }, { @@ -5687,23 +5127,6 @@ ], "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/master" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-09-07T11:33:47+00:00" }, { @@ -5756,23 +5179,6 @@ ], "description": "Symfony ErrorHandler Component", "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/error-handler/tree/v5.2.1" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-12-09T18:54:12+00:00" }, { @@ -5841,23 +5247,6 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v5.2.1" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-12-18T08:03:05+00:00" }, { @@ -5920,23 +5309,6 @@ "interoperability", "standards" ], - "support": { - "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v2.2.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-09-07T11:33:47+00:00" }, { @@ -5981,23 +5353,6 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/finder/tree/v5.2.1" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-12-08T17:02:38+00:00" }, { @@ -6060,23 +5415,6 @@ "interoperability", "standards" ], - "support": { - "source": "https://github.com/symfony/http-client-contracts/tree/v2.3.1" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-10-14T17:08:19+00:00" }, { @@ -6133,23 +5471,6 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/http-foundation/tree/v5.2.1" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-12-18T10:00:10+00:00" }, { @@ -6245,23 +5566,6 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/http-kernel/tree/v5.2.1" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-12-18T13:49:39+00:00" }, { @@ -6325,23 +5629,6 @@ "mime", "mime-type" ], - "support": { - "source": "https://github.com/symfony/mime/tree/v5.2.1" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-12-09T18:54:12+00:00" }, { @@ -6404,23 +5691,6 @@ "polyfill", "portable" ], - "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.20.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-10-23T14:02:19+00:00" }, { @@ -6484,23 +5754,6 @@ "portable", "shim" ], - "support": { - "source": "https://github.com/symfony/polyfill-iconv/tree/v1.20.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-10-23T14:02:19+00:00" }, { @@ -6565,23 +5818,6 @@ "portable", "shim" ], - "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.20.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-10-23T14:02:19+00:00" }, { @@ -6652,23 +5888,6 @@ "portable", "shim" ], - "support": { - "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.20.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-10-23T14:02:19+00:00" }, { @@ -6736,23 +5955,6 @@ "portable", "shim" ], - "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.20.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-10-23T14:02:19+00:00" }, { @@ -6816,23 +6018,6 @@ "portable", "shim" ], - "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.20.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-10-23T14:02:19+00:00" }, { @@ -6884,23 +6069,6 @@ "portable", "shim" ], - "support": { - "source": "https://github.com/symfony/polyfill-php56/tree/v1.20.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-10-23T14:02:19+00:00" }, { @@ -6960,23 +6128,6 @@ "portable", "shim" ], - "support": { - "source": "https://github.com/symfony/polyfill-php72/tree/v1.20.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-10-23T14:02:19+00:00" }, { @@ -7039,23 +6190,6 @@ "portable", "shim" ], - "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/v1.20.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-10-23T14:02:19+00:00" }, { @@ -7122,23 +6256,6 @@ "portable", "shim" ], - "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.20.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-10-23T14:02:19+00:00" }, { @@ -7184,23 +6301,6 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/process/tree/v5.2.1" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-12-08T17:03:37+00:00" }, { @@ -7274,23 +6374,6 @@ "uri", "url" ], - "support": { - "source": "https://github.com/symfony/routing/tree/v5.2.1" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-12-08T17:03:37+00:00" }, { @@ -7353,23 +6436,6 @@ "interoperability", "standards" ], - "support": { - "source": "https://github.com/symfony/service-contracts/tree/master" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-09-07T11:33:47+00:00" }, { @@ -7436,23 +6502,6 @@ "utf-8", "utf8" ], - "support": { - "source": "https://github.com/symfony/string/tree/v5.2.1" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-12-05T07:33:16+00:00" }, { @@ -7529,23 +6578,6 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/translation/tree/v5.2.1" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-12-08T17:03:37+00:00" }, { @@ -7607,23 +6639,6 @@ "interoperability", "standards" ], - "support": { - "source": "https://github.com/symfony/translation-contracts/tree/v2.3.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-09-28T13:05:58+00:00" }, { @@ -7695,23 +6710,6 @@ "debug", "dump" ], - "support": { - "source": "https://github.com/symfony/var-dumper/tree/v5.2.1" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-12-16T17:02:19+00:00" }, { @@ -7761,10 +6759,6 @@ ], "description": "CssToInlineStyles is a class that enables you to convert HTML-pages/files into HTML-pages/files with inline styles. This is very useful when you're sending emails.", "homepage": "https://github.com/tijsverkoyen/CssToInlineStyles", - "support": { - "issues": "https://github.com/tijsverkoyen/CssToInlineStyles/issues", - "source": "https://github.com/tijsverkoyen/CssToInlineStyles/tree/2.2.3" - }, "time": "2020-07-13T06:12:54+00:00" }, { @@ -7839,16 +6833,6 @@ "jwt", "laravel" ], - "support": { - "issues": "https://github.com/tymondesigns/jwt-auth/issues", - "source": "https://github.com/tymondesigns/jwt-auth" - }, - "funding": [ - { - "url": "https://www.patreon.com/seantymon", - "type": "patreon" - } - ], "time": "2020-11-27T12:32:42+00:00" }, { @@ -7913,20 +6897,6 @@ "env", "environment" ], - "support": { - "issues": "https://github.com/vlucas/phpdotenv/issues", - "source": "https://github.com/vlucas/phpdotenv/tree/4.1" - }, - "funding": [ - { - "url": "https://github.com/GrahamCampbell", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/vlucas/phpdotenv", - "type": "tidelift" - } - ], "time": "2020-07-14T19:22:52+00:00" }, { @@ -7975,32 +6945,6 @@ "clean", "php" ], - "support": { - "issues": "https://github.com/voku/portable-ascii/issues", - "source": "https://github.com/voku/portable-ascii/tree/1.5.6" - }, - "funding": [ - { - "url": "https://www.paypal.me/moelleken", - "type": "custom" - }, - { - "url": "https://github.com/voku", - "type": "github" - }, - { - "url": "https://opencollective.com/portable-ascii", - "type": "open_collective" - }, - { - "url": "https://www.patreon.com/voku", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/voku/portable-ascii", - "type": "tidelift" - } - ], "time": "2020-11-12T00:07:28+00:00" } ], @@ -8062,10 +7006,6 @@ "gherkin", "parser" ], - "support": { - "issues": "https://github.com/Behat/Gherkin/issues", - "source": "https://github.com/Behat/Gherkin/tree/master" - }, "time": "2020-03-17T14:03:26+00:00" }, { @@ -8151,10 +7091,6 @@ "functional testing", "unit testing" ], - "support": { - "issues": "https://github.com/Codeception/Codeception/issues", - "source": "https://github.com/Codeception/Codeception/tree/4.0" - }, "time": "2020-02-19T16:56:20+00:00" }, { @@ -8205,10 +7141,6 @@ "keywords": [ "codeception" ], - "support": { - "issues": "https://github.com/Codeception/lib-asserts/issues", - "source": "https://github.com/Codeception/lib-asserts/tree/1.13.2" - }, "time": "2020-10-21T16:26:20+00:00" }, { @@ -8265,10 +7197,6 @@ "keywords": [ "codeception" ], - "support": { - "issues": "https://github.com/Codeception/lib-innerbrowser/issues", - "source": "https://github.com/Codeception/lib-innerbrowser/tree/1.3.5" - }, "time": "2021-01-02T18:59:34+00:00" }, { @@ -8322,10 +7250,6 @@ "asserts", "codeception" ], - "support": { - "issues": "https://github.com/Codeception/module-asserts/issues", - "source": "https://github.com/Codeception/module-asserts/tree/1.3.1" - }, "time": "2020-10-21T16:48:15+00:00" }, { @@ -8374,10 +7298,6 @@ "codeception", "filesystem" ], - "support": { - "issues": "https://github.com/Codeception/module-filesystem/issues", - "source": "https://github.com/Codeception/module-filesystem/tree/1.0.3" - }, "time": "2020-10-24T14:46:40+00:00" }, { @@ -8427,10 +7347,6 @@ "codeception", "laravel5" ], - "support": { - "issues": "https://github.com/Codeception/module-laravel5/issues", - "source": "https://github.com/Codeception/module-laravel5/tree/1.1.1" - }, "time": "2020-10-28T07:00:17+00:00" }, { @@ -8483,10 +7399,6 @@ "browser-testing", "codeception" ], - "support": { - "issues": "https://github.com/Codeception/module-webdriver/issues", - "source": "https://github.com/Codeception/module-webdriver/tree/1.1.4" - }, "time": "2020-11-16T06:50:15+00:00" }, { @@ -8531,10 +7443,6 @@ } ], "description": "PHPUnit classes used by Codeception", - "support": { - "issues": "https://github.com/Codeception/phpunit-wrapper/issues", - "source": "https://github.com/Codeception/phpunit-wrapper/tree/8.1.4" - }, "time": "2020-12-28T14:00:08+00:00" }, { @@ -8565,10 +7473,6 @@ "MIT" ], "description": "Flexible Stub wrapper for PHPUnit's Mock Builder", - "support": { - "issues": "https://github.com/Codeception/Stub/issues", - "source": "https://github.com/Codeception/Stub/tree/3.7.0" - }, "time": "2020-07-03T15:54:43+00:00" }, { @@ -8620,24 +7524,6 @@ "constructor", "instantiate" ], - "support": { - "issues": "https://github.com/doctrine/instantiator/issues", - "source": "https://github.com/doctrine/instantiator/tree/1.4.0" - }, - "funding": [ - { - "url": "https://www.doctrine-project.org/sponsorship.html", - "type": "custom" - }, - { - "url": "https://www.patreon.com/phpdoctrine", - "type": "patreon" - }, - { - "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator", - "type": "tidelift" - } - ], "time": "2020-11-10T18:47:58+00:00" }, { @@ -8687,10 +7573,6 @@ "flare", "ignition" ], - "support": { - "issues": "https://github.com/facade/ignition-contracts/issues", - "source": "https://github.com/facade/ignition-contracts/tree/1.0.2" - }, "time": "2020-10-16T08:27:54+00:00" }, { @@ -8752,10 +7634,6 @@ "throwable", "whoops" ], - "support": { - "issues": "https://github.com/filp/whoops/issues", - "source": "https://github.com/filp/whoops/tree/2.9.1" - }, "time": "2020-11-01T12:00:00+00:00" }, { @@ -8803,10 +7681,6 @@ "keywords": [ "test" ], - "support": { - "issues": "https://github.com/hamcrest/hamcrest-php/issues", - "source": "https://github.com/hamcrest/hamcrest-php/tree/v2.0.1" - }, "time": "2020-07-09T08:09:16+00:00" }, { @@ -8875,10 +7749,6 @@ "test double", "testing" ], - "support": { - "issues": "https://github.com/mockery/mockery/issues", - "source": "https://github.com/mockery/mockery/tree/master" - }, "time": "2020-08-11T18:10:13+00:00" }, { @@ -8927,16 +7797,6 @@ "object", "object graph" ], - "support": { - "issues": "https://github.com/myclabs/DeepCopy/issues", - "source": "https://github.com/myclabs/DeepCopy/tree/1.10.2" - }, - "funding": [ - { - "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy", - "type": "tidelift" - } - ], "time": "2020-11-13T09:40:50+00:00" }, { @@ -9007,24 +7867,6 @@ "php", "symfony" ], - "support": { - "issues": "https://github.com/nunomaduro/collision/issues", - "source": "https://github.com/nunomaduro/collision" - }, - "funding": [ - { - "url": "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=66BYDWAT92N6L", - "type": "custom" - }, - { - "url": "https://github.com/nunomaduro", - "type": "github" - }, - { - "url": "https://www.patreon.com/nunomaduro", - "type": "patreon" - } - ], "time": "2020-10-29T15:12:23+00:00" }, { @@ -9081,10 +7923,6 @@ } ], "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", - "support": { - "issues": "https://github.com/phar-io/manifest/issues", - "source": "https://github.com/phar-io/manifest/tree/master" - }, "time": "2020-06-27T14:33:11+00:00" }, { @@ -9132,10 +7970,6 @@ } ], "description": "Library for handling version information and constraints", - "support": { - "issues": "https://github.com/phar-io/version/issues", - "source": "https://github.com/phar-io/version/tree/3.0.4" - }, "time": "2020-12-13T23:18:30+00:00" }, { @@ -9203,10 +8037,6 @@ "selenium", "webdriver" ], - "support": { - "issues": "https://github.com/php-webdriver/php-webdriver/issues", - "source": "https://github.com/php-webdriver/php-webdriver/tree/1.9.0" - }, "time": "2020-11-19T15:21:05+00:00" }, { @@ -9256,10 +8086,6 @@ "reflection", "static analysis" ], - "support": { - "issues": "https://github.com/phpDocumentor/ReflectionCommon/issues", - "source": "https://github.com/phpDocumentor/ReflectionCommon/tree/2.x" - }, "time": "2020-06-27T09:03:43+00:00" }, { @@ -9312,10 +8138,6 @@ } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "support": { - "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", - "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/master" - }, "time": "2020-09-03T19:13:55+00:00" }, { @@ -9361,10 +8183,6 @@ } ], "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", - "support": { - "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.4.0" - }, "time": "2020-09-17T18:55:26+00:00" }, { @@ -9428,10 +8246,6 @@ "spy", "stub" ], - "support": { - "issues": "https://github.com/phpspec/prophecy/issues", - "source": "https://github.com/phpspec/prophecy/tree/1.12.2" - }, "time": "2020-12-19T10:15:11+00:00" }, { @@ -9495,16 +8309,6 @@ "testing", "xunit" ], - "support": { - "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/7.0.14" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], "time": "2020-12-02T13:39:03+00:00" }, { @@ -9555,16 +8359,6 @@ "filesystem", "iterator" ], - "support": { - "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues", - "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/2.0.3" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], "time": "2020-11-30T08:25:21+00:00" }, { @@ -9606,10 +8400,6 @@ "keywords": [ "template" ], - "support": { - "issues": "https://github.com/sebastianbergmann/php-text-template/issues", - "source": "https://github.com/sebastianbergmann/php-text-template/tree/1.2.1" - }, "time": "2015-06-21T13:50:34+00:00" }, { @@ -9659,16 +8449,6 @@ "keywords": [ "timer" ], - "support": { - "issues": "https://github.com/sebastianbergmann/php-timer/issues", - "source": "https://github.com/sebastianbergmann/php-timer/tree/2.1.3" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], "time": "2020-11-30T08:20:02+00:00" }, { @@ -9718,16 +8498,6 @@ "keywords": [ "tokenizer" ], - "support": { - "issues": "https://github.com/sebastianbergmann/php-token-stream/issues", - "source": "https://github.com/sebastianbergmann/php-token-stream/tree/master" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], "abandoned": true, "time": "2020-08-04T08:28:15+00:00" }, @@ -9812,20 +8582,6 @@ "testing", "xunit" ], - "support": { - "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/8.5.13" - }, - "funding": [ - { - "url": "https://phpunit.de/donate.html", - "type": "custom" - }, - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], "time": "2020-12-01T04:53:52+00:00" }, { @@ -9871,16 +8627,6 @@ ], "description": "Looks up which function or method a line of code belongs to", "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", - "support": { - "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues", - "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/1.0.2" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], "time": "2020-11-30T08:15:22+00:00" }, { @@ -9945,16 +8691,6 @@ "compare", "equality" ], - "support": { - "issues": "https://github.com/sebastianbergmann/comparator/issues", - "source": "https://github.com/sebastianbergmann/comparator/tree/3.0.3" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], "time": "2020-11-30T08:04:30+00:00" }, { @@ -10011,16 +8747,6 @@ "unidiff", "unified diff" ], - "support": { - "issues": "https://github.com/sebastianbergmann/diff/issues", - "source": "https://github.com/sebastianbergmann/diff/tree/3.0.3" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], "time": "2020-11-30T07:59:04+00:00" }, { @@ -10074,16 +8800,6 @@ "environment", "hhvm" ], - "support": { - "issues": "https://github.com/sebastianbergmann/environment/issues", - "source": "https://github.com/sebastianbergmann/environment/tree/4.2.4" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], "time": "2020-11-30T07:53:42+00:00" }, { @@ -10151,16 +8867,6 @@ "export", "exporter" ], - "support": { - "issues": "https://github.com/sebastianbergmann/exporter/issues", - "source": "https://github.com/sebastianbergmann/exporter/tree/3.1.3" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], "time": "2020-11-30T07:47:53+00:00" }, { @@ -10215,16 +8921,6 @@ "keywords": [ "global state" ], - "support": { - "issues": "https://github.com/sebastianbergmann/global-state/issues", - "source": "https://github.com/sebastianbergmann/global-state/tree/3.0.1" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], "time": "2020-11-30T07:43:24+00:00" }, { @@ -10272,16 +8968,6 @@ ], "description": "Traverses array structures and object graphs to enumerate all referenced objects", "homepage": "https://github.com/sebastianbergmann/object-enumerator/", - "support": { - "issues": "https://github.com/sebastianbergmann/object-enumerator/issues", - "source": "https://github.com/sebastianbergmann/object-enumerator/tree/3.0.4" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], "time": "2020-11-30T07:40:27+00:00" }, { @@ -10327,16 +9013,6 @@ ], "description": "Allows reflection of object attributes, including inherited and non-public ones", "homepage": "https://github.com/sebastianbergmann/object-reflector/", - "support": { - "issues": "https://github.com/sebastianbergmann/object-reflector/issues", - "source": "https://github.com/sebastianbergmann/object-reflector/tree/1.1.2" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], "time": "2020-11-30T07:37:18+00:00" }, { @@ -10390,16 +9066,6 @@ ], "description": "Provides functionality to recursively process PHP variables", "homepage": "http://www.github.com/sebastianbergmann/recursion-context", - "support": { - "issues": "https://github.com/sebastianbergmann/recursion-context/issues", - "source": "https://github.com/sebastianbergmann/recursion-context/tree/3.0.1" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], "time": "2020-11-30T07:34:24+00:00" }, { @@ -10442,16 +9108,6 @@ ], "description": "Provides a list of PHP built-in functions that operate on resources", "homepage": "https://www.github.com/sebastianbergmann/resource-operations", - "support": { - "issues": "https://github.com/sebastianbergmann/resource-operations/issues", - "source": "https://github.com/sebastianbergmann/resource-operations/tree/2.0.2" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], "time": "2020-11-30T07:30:19+00:00" }, { @@ -10498,16 +9154,6 @@ ], "description": "Collection of value objects that represent the types of the PHP type system", "homepage": "https://github.com/sebastianbergmann/type", - "support": { - "issues": "https://github.com/sebastianbergmann/type/issues", - "source": "https://github.com/sebastianbergmann/type/tree/1.1.4" - }, - "funding": [ - { - "url": "https://github.com/sebastianbergmann", - "type": "github" - } - ], "time": "2020-11-30T07:25:11+00:00" }, { @@ -10551,10 +9197,6 @@ ], "description": "Library that helps with managing the version number of Git-hosted PHP projects", "homepage": "https://github.com/sebastianbergmann/version", - "support": { - "issues": "https://github.com/sebastianbergmann/version/issues", - "source": "https://github.com/sebastianbergmann/version/tree/master" - }, "time": "2016-10-03T07:35:21+00:00" }, { @@ -10609,23 +9251,6 @@ ], "description": "Symfony BrowserKit Component", "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/browser-kit/tree/v5.2.1" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-12-18T08:03:05+00:00" }, { @@ -10683,23 +9308,6 @@ ], "description": "Symfony DomCrawler Component", "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/dom-crawler/tree/v5.2.1" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-12-18T08:02:46+00:00" }, { @@ -10758,23 +9366,6 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "support": { - "source": "https://github.com/symfony/yaml/tree/v5.2.1" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], "time": "2020-12-08T17:02:38+00:00" }, { @@ -10815,16 +9406,6 @@ } ], "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", - "support": { - "issues": "https://github.com/theseer/tokenizer/issues", - "source": "https://github.com/theseer/tokenizer/tree/master" - }, - "funding": [ - { - "url": "https://github.com/theseer", - "type": "github" - } - ], "time": "2020-07-12T23:59:07+00:00" }, { @@ -10874,10 +9455,6 @@ "check", "validate" ], - "support": { - "issues": "https://github.com/webmozart/assert/issues", - "source": "https://github.com/webmozart/assert/tree/master" - }, "time": "2020-07-08T17:02:28+00:00" } ], @@ -10898,6 +9475,5 @@ "ext-pdo_mysql": "*", "ext-tokenizer": "*" }, - "platform-dev": [], - "plugin-api-version": "2.0.0" + "platform-dev": [] } diff --git a/packages/Webkul/Admin/src/Http/Controllers/Sales/InvoiceController.php b/packages/Webkul/Admin/src/Http/Controllers/Sales/InvoiceController.php index 792182101..76e9dab22 100755 --- a/packages/Webkul/Admin/src/Http/Controllers/Sales/InvoiceController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/Sales/InvoiceController.php @@ -2,10 +2,10 @@ namespace Webkul\Admin\Http\Controllers\Sales; +use PDF; use Webkul\Admin\Http\Controllers\Controller; use Webkul\Sales\Repositories\OrderRepository; use Webkul\Sales\Repositories\InvoiceRepository; -use PDF; class InvoiceController extends Controller { @@ -141,8 +141,30 @@ class InvoiceController extends Controller { $invoice = $this->invoiceRepository->findOrFail($id); - $pdf = PDF::loadView('admin::sales.invoices.pdf', compact('invoice'))->setPaper('a4'); + $html = view('admin::sales.invoices.pdf', compact('invoice'))->render(); - return $pdf->download('invoice-' . $invoice->created_at->format('d-m-Y') . '.pdf'); + return PDF::loadHTML($this->adjustArabicAndPersianContent($html)) + ->setPaper('a4') + ->download('invoice-' . $invoice->created_at->format('d-m-Y') . '.pdf'); + } + + /** + * Adjust arabic and persian content. + * + * @param string $html + * @return string + */ + private function adjustArabicAndPersianContent($html) + { + $arabic = new \ArPHP\I18N\Arabic(); + + $p = $arabic->arIdentify($html); + + for ($i = count($p)-1; $i >= 0; $i-=2) { + $utf8ar = $arabic->utf8Glyphs(substr($html, $p[$i-1], $p[$i] - $p[$i-1])); + $html = substr_replace($html, $utf8ar, $p[$i-1], $p[$i] - $p[$i-1]); + } + + return $html; } } From e0edd790ec9397d028fb75e58de162e3cc2bb7ae Mon Sep 17 00:00:00 2001 From: devansh bawari Date: Fri, 8 Jan 2021 20:31:04 +0530 Subject: [PATCH 4/8] Fixed Some Spaces --- .../Admin/src/Http/Controllers/Sales/InvoiceController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/Webkul/Admin/src/Http/Controllers/Sales/InvoiceController.php b/packages/Webkul/Admin/src/Http/Controllers/Sales/InvoiceController.php index 76e9dab22..a06b3706d 100755 --- a/packages/Webkul/Admin/src/Http/Controllers/Sales/InvoiceController.php +++ b/packages/Webkul/Admin/src/Http/Controllers/Sales/InvoiceController.php @@ -160,7 +160,7 @@ class InvoiceController extends Controller $p = $arabic->arIdentify($html); - for ($i = count($p)-1; $i >= 0; $i-=2) { + for ($i = count($p)-1; $i >= 0; $i -= 2) { $utf8ar = $arabic->utf8Glyphs(substr($html, $p[$i-1], $p[$i] - $p[$i-1])); $html = substr_replace($html, $utf8ar, $p[$i-1], $p[$i] - $p[$i-1]); } From 983f9c9d9dc04dd76c55c07d5e3da70dbd2e3e27 Mon Sep 17 00:00:00 2001 From: Devansh Date: Fri, 8 Jan 2021 23:27:04 +0530 Subject: [PATCH 5/8] Status Exception Fixed In Content, Inventory Sources And User --- .../Webkul/Admin/src/DataGrids/InventorySourcesDataGrid.php | 2 ++ packages/Webkul/Admin/src/DataGrids/UserDataGrid.php | 1 + packages/Webkul/Velocity/src/DataGrids/ContentDataGrid.php | 1 + 3 files changed, 4 insertions(+) diff --git a/packages/Webkul/Admin/src/DataGrids/InventorySourcesDataGrid.php b/packages/Webkul/Admin/src/DataGrids/InventorySourcesDataGrid.php index 5ec09313d..54bb1a728 100755 --- a/packages/Webkul/Admin/src/DataGrids/InventorySourcesDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/InventorySourcesDataGrid.php @@ -15,6 +15,8 @@ class InventorySourcesDataGrid extends DataGrid { $queryBuilder = DB::table('inventory_sources')->addSelect('id', 'code', 'name', 'priority', 'status'); + $this->addFilter('status', 'status'); + $this->setQueryBuilder($queryBuilder); } diff --git a/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php b/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php index 44601be07..59b4f57ff 100755 --- a/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/UserDataGrid.php @@ -20,6 +20,7 @@ class UserDataGrid extends DataGrid $this->addFilter('user_id', 'u.id'); $this->addFilter('user_name', 'u.name'); $this->addFilter('role_name', 'ro.name'); + $this->addFilter('status', 'u.status'); $this->setQueryBuilder($queryBuilder); } diff --git a/packages/Webkul/Velocity/src/DataGrids/ContentDataGrid.php b/packages/Webkul/Velocity/src/DataGrids/ContentDataGrid.php index 295a43429..615dd2dd0 100644 --- a/packages/Webkul/Velocity/src/DataGrids/ContentDataGrid.php +++ b/packages/Webkul/Velocity/src/DataGrids/ContentDataGrid.php @@ -22,6 +22,7 @@ class ContentDataGrid extends DataGrid ->groupBy('con.id'); $this->addFilter('content_id', 'con.id'); + $this->addFilter('status', 'con.status'); $this->setQueryBuilder($queryBuilder); } From f9c54383b98eafb4f39d2db3572604c65390cdd8 Mon Sep 17 00:00:00 2001 From: devansh bawari Date: Mon, 11 Jan 2021 17:53:18 +0530 Subject: [PATCH 6/8] Filter Added To Catalog Rule, Cart Rule And Email Template --- packages/Webkul/Admin/src/DataGrids/CartRuleDataGrid.php | 2 ++ packages/Webkul/Admin/src/DataGrids/CatalogRuleDataGrid.php | 3 +++ packages/Webkul/Admin/src/DataGrids/EmailTemplateDataGrid.php | 2 ++ 3 files changed, 7 insertions(+) diff --git a/packages/Webkul/Admin/src/DataGrids/CartRuleDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CartRuleDataGrid.php index 5abaa1544..b91d7ff1e 100644 --- a/packages/Webkul/Admin/src/DataGrids/CartRuleDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CartRuleDataGrid.php @@ -62,6 +62,8 @@ class CartRuleDataGrid extends DataGrid $queryBuilder->where('cart_rule_channels.channel_id', $this->channel); } + $this->addFilter('status', 'status'); + $this->setQueryBuilder($queryBuilder); } diff --git a/packages/Webkul/Admin/src/DataGrids/CatalogRuleDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CatalogRuleDataGrid.php index 540afc637..4e79a0847 100644 --- a/packages/Webkul/Admin/src/DataGrids/CatalogRuleDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CatalogRuleDataGrid.php @@ -16,6 +16,9 @@ class CatalogRuleDataGrid extends DataGrid $queryBuilder = DB::table('catalog_rules') ->addSelect('catalog_rules.id', 'name', 'status', 'starts_from', 'ends_till', 'sort_order'); + + $this->addFilter('status', 'status'); + $this->setQueryBuilder($queryBuilder); } diff --git a/packages/Webkul/Admin/src/DataGrids/EmailTemplateDataGrid.php b/packages/Webkul/Admin/src/DataGrids/EmailTemplateDataGrid.php index 833a8f424..da88abdac 100755 --- a/packages/Webkul/Admin/src/DataGrids/EmailTemplateDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/EmailTemplateDataGrid.php @@ -15,6 +15,8 @@ class EmailTemplateDataGrid extends DataGrid { $queryBuilder = DB::table('marketing_templates')->addSelect('id', 'name', 'status'); + $this->addFilter('status', 'status'); + $this->setQueryBuilder($queryBuilder); } From 238d46a4dd51c480e0ba5accc941e5fd8b340d52 Mon Sep 17 00:00:00 2001 From: devansh bawari Date: Tue, 12 Jan 2021 11:41:18 +0530 Subject: [PATCH 7/8] Currency Symbol Issue Fixed --- .../views/sales/invoices/pdf.blade.php | 18 +++++++++--------- packages/Webkul/Core/src/Core.php | 16 ++++++++++------ 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/packages/Webkul/Admin/src/Resources/views/sales/invoices/pdf.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/invoices/pdf.blade.php index d935a1f40..b8a8e2007 100755 --- a/packages/Webkul/Admin/src/Resources/views/sales/invoices/pdf.blade.php +++ b/packages/Webkul/Admin/src/Resources/views/sales/invoices/pdf.blade.php @@ -260,11 +260,11 @@
@endif - {{ core()->formatBasePrice($item->base_price) }} + {!! core()->formatBasePrice($item->base_price, true) !!} {{ $item->qty }} - {{ core()->formatBasePrice($item->base_total) }} - {{ core()->formatBasePrice($item->base_tax_amount) }} - {{ core()->formatBasePrice($item->base_total + $item->base_tax_amount) }} + {!! core()->formatBasePrice($item->base_total, true) !!} + {!! core()->formatBasePrice($item->base_tax_amount, true) !!} + {!! core()->formatBasePrice($item->base_total + $item->base_tax_amount, true) !!} @endforeach @@ -277,31 +277,31 @@ {{ __('admin::app.sales.orders.subtotal') }} - - {{ core()->formatBasePrice($invoice->base_sub_total) }} + {!! core()->formatBasePrice($invoice->base_sub_total, true) !!} {{ __('admin::app.sales.orders.shipping-handling') }} - - {{ core()->formatBasePrice($invoice->base_shipping_amount) }} + {!! core()->formatBasePrice($invoice->base_shipping_amount, true) !!} {{ __('admin::app.sales.orders.tax') }} - - {{ core()->formatBasePrice($invoice->base_tax_amount) }} + {!! core()->formatBasePrice($invoice->base_tax_amount, true) !!} {{ __('admin::app.sales.orders.discount') }} - - {{ core()->formatBasePrice($invoice->base_discount_amount) }} + {!! core()->formatBasePrice($invoice->base_discount_amount, true) !!} {{ __('admin::app.sales.orders.grand-total') }} - - {{ core()->formatBasePrice($invoice->base_grand_total) }} + {!! core()->formatBasePrice($invoice->base_grand_total, true) !!} diff --git a/packages/Webkul/Core/src/Core.php b/packages/Webkul/Core/src/Core.php index cc3046ca8..7fcf26a70 100755 --- a/packages/Webkul/Core/src/Core.php +++ b/packages/Webkul/Core/src/Core.php @@ -554,13 +554,15 @@ class Core } /** - * Format price with base currency symbol + * Format price with base currency symbol. This method also give ability to encode + * the base currency symbol and its optional. * - * @param float $price + * @param float $price + * @param bool $isEncoded * * @return string */ - public function formatBasePrice($price) + public function formatBasePrice($price, $isEncoded = false) { if (is_null($price)) { $price = 0; @@ -570,15 +572,17 @@ class Core if ($symbol = $this->getBaseCurrency()->symbol) { if ($this->currencySymbol($this->getBaseCurrencyCode()) == $symbol) { - return $formater->formatCurrency($price, $this->getBaseCurrencyCode()); + $content = $formater->formatCurrency($price, $this->getBaseCurrencyCode()); } else { $formater->setSymbol(\NumberFormatter::CURRENCY_SYMBOL, $symbol); - return $formater->format($this->convertPrice($price)); + $content = $formater->format($this->convertPrice($price)); } } else { - return $formater->formatCurrency($price, $this->getBaseCurrencyCode()); + $content = $formater->formatCurrency($price, $this->getBaseCurrencyCode()); } + + return ! $isEncoded ? $content : htmlentities($content); } /** From bfce18c60e5c6b5bb29900f1b8c3c69e29a70f07 Mon Sep 17 00:00:00 2001 From: devansh bawari Date: Tue, 12 Jan 2021 14:06:45 +0530 Subject: [PATCH 8/8] Request Splitted To Reduce Load From The Checkout Page --- .../views/shop/checkout/onepage.blade.php | 36 +++++++++++++++---- .../onepage/customer-new-form.blade.php | 12 +++---- 2 files changed, 36 insertions(+), 12 deletions(-) diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage.blade.php index 29830552e..7393d05a5 100644 --- a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage.blade.php @@ -132,8 +132,8 @@ new_shipping_address: false, selected_payment_method: '', selected_shipping_method: '', - country: @json(core()->countries()), - countryStates: @json(core()->groupedStatesByCountries()), + countries: [], + countryStates: [], step_numbers: { 'information': 1, @@ -157,6 +157,10 @@ }, created: function () { + this.fetchCountries(); + + this.fetchCountryStates(); + this.getOrderSummary(); if (! customerAddress) { @@ -173,11 +177,11 @@ } else { this.allAddress = customerAddress; - for (var country in this.country) { - for (var code in this.allAddress) { + for (let country in this.countries) { + for (let code in this.allAddress) { if (this.allAddress[code].country) { - if (this.allAddress[code].country == this.country[country].code) { - this.allAddress[code]['country'] = this.country[country].name; + if (this.allAddress[code].country == this.countries[country].code) { + this.allAddress[code]['country'] = this.countries[country].name; } } } @@ -194,6 +198,26 @@ } }, + fetchCountries: function () { + let countriesEndPoint = `${this.$root.baseUrl}/api/countries?pagination=0`; + + this.$http.get(countriesEndPoint) + .then(response => { + this.countries = response.data.data; + }) + .catch(function (error) {}); + }, + + fetchCountryStates: function () { + let countryStateEndPoint = `${this.$root.baseUrl}/api/country-states?pagination=0`; + + this.$http.get(countryStateEndPoint) + .then(response => { + this.countryStates = response.data.data; + }) + .catch(function (error) {}); + }, + haveStates: function (addressType) { if (this.countryStates[this.address[addressType].country] && this.countryStates[this.address[addressType].country].length) return true; diff --git a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/customer-new-form.blade.php b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/customer-new-form.blade.php index 405de6f73..92732accc 100644 --- a/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/customer-new-form.blade.php +++ b/packages/Webkul/Velocity/src/Resources/views/shop/checkout/onepage/customer-new-form.blade.php @@ -137,9 +137,9 @@ - @foreach (core()->countries() as $country) - - @endforeach +
@@ -410,9 +410,9 @@ - @foreach (core()->countries() as $country) - - @endforeach +