diff --git a/app/Http/Controllers/ExportController.php b/app/Http/Controllers/ExportController.php index 5df871824be4..f1e74bd2a924 100644 --- a/app/Http/Controllers/ExportController.php +++ b/app/Http/Controllers/ExportController.php @@ -12,6 +12,7 @@ use App\Models\Contact; use App\Models\Credit; use App\Models\Task; use App\Models\Invoice; +use App\Models\Product; use App\Models\Payment; use App\Models\Expense; use App\Models\Vendor; @@ -220,6 +221,12 @@ class ExportController extends BaseController ->get(); } + if ($request->input('include') === 'all' || $request->input('products')) { + $data['products'] = Product::scope() + ->withArchived() + ->get(); + } + if ($request->input('include') === 'all' || $request->input('vendors')) { $data['vendors'] = Vendor::scope() ->with('user', 'vendor_contacts', 'country') diff --git a/app/Ninja/Presenters/ProductPresenter.php b/app/Ninja/Presenters/ProductPresenter.php index 0e3acba47d96..786e61cba75c 100644 --- a/app/Ninja/Presenters/ProductPresenter.php +++ b/app/Ninja/Presenters/ProductPresenter.php @@ -4,6 +4,10 @@ use App\Libraries\Skype\HeroCard; class ProductPresenter extends EntityPresenter { + public function user() + { + return $this->entity->user->getDisplayName(); + } public function skypeBot($account) { diff --git a/resources/views/accounts/import_export.blade.php b/resources/views/accounts/import_export.blade.php index a84f9b029377..26b4535766ea 100644 --- a/resources/views/accounts/import_export.blade.php +++ b/resources/views/accounts/import_export.blade.php @@ -81,6 +81,7 @@ @include('partials/checkbox', ['field' => 'payments'])
+ @include('partials/checkbox', ['field' => 'products']) @include('partials/checkbox', ['field' => 'expenses']) @include('partials/checkbox', ['field' => 'vendors']) @include('partials/checkbox', ['field' => 'vendor_contacts']) diff --git a/resources/views/export.blade.php b/resources/views/export.blade.php index a0f8c933f016..d7c875eb044b 100644 --- a/resources/views/export.blade.php +++ b/resources/views/export.blade.php @@ -45,6 +45,11 @@ @include('export.payments') @endif + @if (isset($products) && $products && count($products)) + {{ strtoupper(trans('texts.products')) }} + @include('export.products') + @endif + @if (isset($expenses) && $expenses && count($expenses)) {{ strtoupper(trans('texts.expenses')) }} @include('export.expenses') diff --git a/resources/views/export/products.blade.php b/resources/views/export/products.blade.php new file mode 100644 index 000000000000..fd96f9530d95 --- /dev/null +++ b/resources/views/export/products.blade.php @@ -0,0 +1,21 @@ + + @if ($multiUser) + {{ trans('texts.user') }} + @endif + {{ trans('texts.product') }} + {{ trans('texts.notes') }} + {{ trans('texts.cost') }} + + +@foreach ($products as $product) + + @if ($multiUser) + {{ $product->present()->user }} + @endif + {{ $product->product_key }} + {{ $product->notes }} + {{ $product->cost }} + +@endforeach + +