Create invoice form part 1.

This commit is contained in:
Peter Papp
2021-04-30 17:53:19 +02:00
parent 5167ae520e
commit 3c3e82758d
51 changed files with 1890 additions and 763 deletions

View File

@@ -1,23 +1,22 @@
<?php
namespace App\Http\Controllers\Oasis;
use App\Http\Controllers\Controller;
use App\Http\Requests\Admin\CreateUserByAdmin;
use App\Http\Requests\Oasis\CreateOrderRequest;
use App\Http\Resources\UserResource;
use App\Models\User;
use App\Models\UserSettings;
use App\Notifications\Oasis\PaymentRequiredNotification;
use App\Services\Oasis\CzechRegisterSearchService;
use App\Services\StripeService;
use Hash;
use Illuminate\Contracts\Foundation\Application;
use Illuminate\Contracts\Routing\ResponseFactory;
use Notification;
use App\Models\User;
use Illuminate\Support\Str;
use App\Models\UserSettings;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use Illuminate\Support\Str;
use Notification;
use App\Services\StripeService;
use App\Http\Controllers\Controller;
use App\Http\Resources\UserResource;
use App\Http\Requests\Admin\CreateUserByAdmin;
use App\Http\Requests\Oasis\CreateOrderRequest;
use Illuminate\Contracts\Foundation\Application;
use Illuminate\Contracts\Routing\ResponseFactory;
use App\Services\Oasis\CzechRegisterSearchService;
use App\Notifications\Oasis\PaymentRequiredNotification;
class AdminController extends Controller
{
@@ -51,7 +50,7 @@ class AdminController extends Controller
{
// Create user
$newbie = User::create([
'email' => $request->email,
'email' => $request->email,
'password' => Hash::make(Str::random()),
]);
@@ -62,15 +61,15 @@ class AdminController extends Controller
->settings()
->create([
'storage_capacity' => 0,
'ico' => $request->ico ?? null,
'name' => $request->name,
'address' => $request->address,
'state' => $request->state,
'city' => $request->city,
'postal_code' => $request->postal_code,
'country' => $request->country,
'phone_number' => $request->phone_number ?? null,
'timezone' => '1.0',
'ico' => $request->ico ?? null,
'name' => $request->name,
'address' => $request->address,
'state' => $request->state,
'city' => $request->city,
'postal_code' => $request->postal_code,
'country' => $request->country,
'phone_number' => $request->phone_number ?? null,
'timezone' => '1.0',
]);
// Store subscription request
@@ -90,7 +89,8 @@ class AdminController extends Controller
));
return response(
new UserResource($newbie), 201
new UserResource($newbie),
201
);
}
@@ -104,8 +104,8 @@ class AdminController extends Controller
{
// Create user
$user = User::forceCreate([
'role' => $request->role,
'email' => $request->email,
'role' => $request->role,
'email' => $request->email,
'password' => \Illuminate\Support\Facades\Hash::make($request->password),
]);
@@ -114,9 +114,9 @@ class AdminController extends Controller
$user
->settings()
->create([
'name' => $request->name,
'avatar' => store_avatar($request, 'avatar'),
'storage_capacity' => $request->storage_capacity,
'name' => $request->name,
'avatar' => store_avatar($request, 'avatar'),
'storage_capacity' => $request->storage_capacity,
'payment_activation' => 1,
]);

View File

@@ -1,19 +1,17 @@
<?php
namespace App\Http\Controllers\Oasis;
use App\Http\Requests\Oasis\StoreClientRequest;
use App\Http\Resources\Oasis\OasisInvoiceCollection;
use App\Http\Resources\Oasis\OasisViewClientCollection;
use App\Http\Controllers\Controller;
use App\Http\Resources\Oasis\OasisViewClientResource;
use App\Http\Resources\Oasis\OasisViewInvoiceCollection;
use App\Models\Oasis\Client;
use Auth;
use Illuminate\Contracts\Foundation\Application;
use Illuminate\Contracts\Routing\ResponseFactory;
use App\Models\Oasis\Client;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use App\Http\Controllers\Controller;
use App\Http\Requests\Oasis\StoreClientRequest;
use Illuminate\Contracts\Foundation\Application;
use Illuminate\Contracts\Routing\ResponseFactory;
use App\Http\Resources\Oasis\OasisInvoiceCollection;
use App\Http\Resources\Oasis\OasisViewClientResource;
use App\Http\Resources\Oasis\OasisViewClientCollection;
class ClientController extends Controller
{
@@ -23,7 +21,8 @@ class ClientController extends Controller
public function index()
{
return response(
new OasisViewClientCollection(Auth::user()->clients), 200
new OasisViewClientCollection(Auth::user()->clients),
200
);
}
@@ -36,21 +35,22 @@ class ClientController extends Controller
$client = $request->user()
->clients()
->create([
'avatar' => store_avatar($request, 'avatar') ?? null,
'name' => $request->name,
'email' => $request->email ?? null,
'avatar' => store_avatar($request, 'avatar') ?? null,
'name' => $request->name,
'email' => $request->email ?? null,
'phone_number' => $request->phone_number ?? null,
'address' => $request->address,
'city' => $request->city,
'postal_code' => $request->postal_code,
'country' => $request->country,
'ico' => $request->ico ?? null,
'dic' => $request->dic ?? null,
'ic_dph' => $request->ic_dph ?? null,
'address' => $request->address,
'city' => $request->city,
'postal_code' => $request->postal_code,
'country' => $request->country,
'ico' => $request->ico ?? null,
'dic' => $request->dic ?? null,
'ic_dph' => $request->ic_dph ?? null,
]);
return response(
new OasisViewClientResource($client), 201
new OasisViewClientResource($client),
201
);
}
@@ -72,10 +72,9 @@ class ClientController extends Controller
{
// Store image if exist
if ($request->hasFile($request->name)) {
// Find and update image path
$client->update([
$request->name => store_avatar($request, $request->name)
$request->name => store_avatar($request, $request->name),
]);
return response('Done', 204);
@@ -120,7 +119,8 @@ class ClientController extends Controller
->get();
return response(
new OasisViewClientCollection($results), 200
new OasisViewClientCollection($results),
200
);
}
}

View File

@@ -1,22 +1,21 @@
<?php
namespace App\Http\Controllers\Oasis;
use App\Http\Controllers\Controller;
use App\Http\Requests\Oasis\StoreInvoiceRequest;
use App\Http\Resources\Oasis\OasisViewInvoiceCollection;
use App\Http\Resources\Oasis\OasisViewInvoiceResource;
use Auth;
use Storage;
use Carbon\Carbon;
use Illuminate\Support\Str;
use App\Models\Oasis\Client;
use App\Models\Oasis\Invoice;
use App\Notifications\Oasis\InvoiceDeliveryNotification;
use App\Notifications\SharedSendViaEmail;
use Auth;
use Illuminate\Http\Response;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Notification;
use App\Http\Requests\Oasis\StoreInvoiceRequest;
use Illuminate\Contracts\Foundation\Application;
use Illuminate\Contracts\Routing\ResponseFactory;
use Illuminate\Http\Response;
use Illuminate\Support\Facades\Notification;
use Illuminate\Support\Str;
use Storage;
use App\Http\Resources\Oasis\OasisViewInvoiceResource;
use App\Http\Resources\Oasis\OasisViewInvoiceCollection;
use App\Notifications\Oasis\InvoiceDeliveryNotification;
class InvoiceController extends Controller
{
@@ -26,7 +25,8 @@ class InvoiceController extends Controller
public function get_all_regular_invoices()
{
return response(
new OasisViewInvoiceCollection(Auth::user()->regularInvoices), 200
new OasisViewInvoiceCollection(Auth::user()->regularInvoices),
200
);
}
@@ -36,7 +36,8 @@ class InvoiceController extends Controller
public function get_all_advance_invoices()
{
return response(
new OasisViewInvoiceCollection(Auth::user()->advanceInvoices), 200
new OasisViewInvoiceCollection(Auth::user()->advanceInvoices),
200
);
}
@@ -46,7 +47,7 @@ class InvoiceController extends Controller
*/
public function get_invoice(Invoice $invoice)
{
if (!Storage::exists(invoice_path($invoice))) {
if (! Storage::exists(invoice_path($invoice))) {
abort(404, 'Not Found');
}
@@ -66,7 +67,8 @@ class InvoiceController extends Controller
->get();
return response(
new OasisViewInvoiceCollection($results), 200
new OasisViewInvoiceCollection($results),
200
);
}
@@ -82,33 +84,33 @@ class InvoiceController extends Controller
$user = $request->user();
$invoice = Invoice::create([
'user_id' => $user->id,
'client_id' => $client->id ?? null,
'invoice_type' => $request->invoice_type,
'invoice_number' => $request->invoice_number,
'user_id' => $user->id,
'client_id' => $client->id ?? null,
'invoice_type' => $request->invoice_type,
'invoice_number' => $request->invoice_number,
'variable_number' => $request->variable_number,
'delivery_at' => $request->delivery_at,
'discount_type' => $request->discount_type ?? null,
'discount_rate' => $request->discount_rate ?? null,
'items' => $request->items,
'user' => $user->invoiceProfile,
'client' => [
'email' => $client->email ?? $request->client_email,
'name' => $client->name ?? $request->client_name,
'address' => $client->address ?? $request->client_address,
'city' => $client->city ?? $request->client_city,
'delivery_at' => $request->delivery_at,
'discount_type' => $request->discount_type ?? null,
'discount_rate' => $request->discount_rate ?? null,
'items' => json_decode($request->items),
'user' => $user->invoiceProfile,
'client' => [
'email' => $client->email ?? $request->client_email,
'name' => $client->name ?? $request->client_name,
'address' => $client->address ?? $request->client_address,
'city' => $client->city ?? $request->client_city,
'postal_code' => $client->postal_code ?? $request->client_postal_code,
'country' => $client->country ?? $request->client_country,
'ico' => $client->ico ?? $request->client_ico,
'dic' => $client->dic ?? $request->client_dic ?? null,
'ic_dph' => $client->ic_dph ?? $request->client_ic_dph ?? null,
'country' => $client->country ?? $request->client_country,
'ico' => $client->ico ?? $request->client_ico,
'dic' => $client->dic ?? $request->client_dic ?? null,
'ic_dph' => $client->ic_dph ?? $request->client_ic_dph ?? null,
],
]);
// Generate PDF
\PDF::loadView('oasis.invoices.invoice', [
'invoice' => Invoice::find($invoice->id),
'user' => $user,
'user' => $user,
])
->setPaper('a4')
->setOrientation('portrait')
@@ -123,7 +125,8 @@ class InvoiceController extends Controller
}
return response(
new OasisViewInvoiceResource($invoice), 201
new OasisViewInvoiceResource($invoice),
201
);
}
@@ -138,28 +141,53 @@ class InvoiceController extends Controller
return response('Done', 204);
}
/**
* @return array
*/
public function editor()
{
$user = Auth::user();
return [
'clients' => $user->clients->map(function ($client) {
return [
'label' => $client->name,
'value' => $client->id,
];
}),
'isVatPayer' => $user->invoiceProfile->ic_dph
? true
: false,
'latestInvoiceNumber' => $user->regularInvoices->last()
? (int) $user->regularInvoices->last()->invoice_number
: null,
'recommendedInvoiceNumber' => $user->regularInvoices->last()
? (int) $user->regularInvoices->last()->invoice_number + 1
: Carbon::now()->format('Y') . '0001',
];
}
/**
* @param StoreInvoiceRequest $request
* @return mixed
*/
private function getOrStoreClient(StoreInvoiceRequest $request)
{
if (!Str::isUuid($request->client) && $request->store_client) {
if (! Str::isUuid($request->client) && $request->store_client) {
return $request->user()
->clients()
->create([
'avatar' => store_avatar($request, 'client_avatar') ?? null,
'name' => $request->client_name,
'email' => $request->client_email ?? null,
'avatar' => store_avatar($request, 'client_avatar') ?? null,
'name' => $request->client_name,
'email' => $request->client_email ?? null,
'phone_number' => $request->client_phone_number ?? null,
'address' => $request->client_address,
'city' => $request->client_city,
'postal_code' => $request->client_postal_code,
'country' => $request->client_country,
'ico' => $request->client_ico ?? null,
'dic' => $request->client_dic ?? null,
'ic_dph' => $request->client_ic_dph ?? null,
'address' => $request->client_address,
'city' => $request->client_city,
'postal_code' => $request->client_postal_code,
'country' => $request->client_country,
'ico' => $request->client_ico ?? null,
'dic' => $request->client_dic ?? null,
'ic_dph' => $request->client_ic_dph ?? null,
]);
}

View File

@@ -1,16 +1,14 @@
<?php
namespace App\Http\Controllers\Oasis;
use App\Http\Controllers\Controller;
use App\Http\Resources\Oasis\InvoiceProfileResource;
use App\Models\Oasis\InvoiceProfile;
use App\Models\Setting;
use Auth;
use Illuminate\Contracts\Foundation\Application;
use Illuminate\Contracts\Routing\ResponseFactory;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use App\Http\Controllers\Controller;
use App\Models\Oasis\InvoiceProfile;
use Illuminate\Contracts\Foundation\Application;
use Illuminate\Contracts\Routing\ResponseFactory;
use App\Http\Resources\Oasis\InvoiceProfileResource;
class InvoiceProfileController extends Controller
{
@@ -20,9 +18,11 @@ class InvoiceProfileController extends Controller
public function show()
{
return response(
new InvoiceProfileResource(Auth::user()->invoiceProfile), 200
new InvoiceProfileResource(Auth::user()->invoiceProfile),
200
);
}
/**
* @param Request $request
* @return Application|ResponseFactory|Response
@@ -30,29 +30,30 @@ class InvoiceProfileController extends Controller
public function store(Request $request)
{
$profile = InvoiceProfile::create([
'user_id' => $request->user()->id,
'logo' => store_system_image($request, 'logo') ?? null,
'stamp' => store_system_image($request, 'stamp') ?? null,
'company' => $request->company,
'email' => $request->email,
'ico' => $request->ico,
'dic' => $request->dic,
'ic_dph' => $request->ic_dph,
'user_id' => $request->user()->id,
'logo' => store_system_image($request, 'logo') ?? null,
'stamp' => store_system_image($request, 'stamp') ?? null,
'company' => $request->company,
'email' => $request->email,
'ico' => $request->ico,
'dic' => $request->dic,
'ic_dph' => $request->ic_dph,
'registration_notes' => $request->registration_notes,
'author' => $request->author,
'address' => $request->address,
'state' => $request->state,
'city' => $request->city,
'postal_code' => $request->postal_code,
'country' => $request->country,
'phone' => $request->phone,
'bank' => $request->bank,
'iban' => $request->iban,
'swift' => $request->swift,
'author' => $request->author,
'address' => $request->address,
'state' => $request->state,
'city' => $request->city,
'postal_code' => $request->postal_code,
'country' => $request->country,
'phone' => $request->phone,
'bank' => $request->bank,
'iban' => $request->iban,
'swift' => $request->swift,
]);
return response(
new InvoiceProfileResource($profile), 201
new InvoiceProfileResource($profile),
201
);
}
@@ -64,12 +65,11 @@ class InvoiceProfileController extends Controller
{
// Store image if exist
if ($request->hasFile($request->name)) {
// Find and update image path
$request->user()
->invoiceProfile()
->update([
$request->name => store_system_image($request, $request->name)
$request->name => store_system_image($request, $request->name),
]);
return response('Done', 204);

View File

@@ -1,20 +1,17 @@
<?php
namespace App\Http\Controllers\Oasis;
use App\Http\Controllers\Controller;
use App\Http\Requests\User\UpdateUserPasswordRequest;
use App\Http\Resources\Oasis\SubscriptionRequestResource;
use App\Http\Resources\PlanResource;
use App\Models\Oasis\SubscriptionRequest;
use App\Services\StripeService;
use Illuminate\Contracts\Foundation\Application;
use Illuminate\Contracts\Routing\ResponseFactory;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use App\Services\StripeService;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Facades\Hash;
use App\Models\Oasis\SubscriptionRequest;
use Illuminate\Contracts\Foundation\Application;
use Illuminate\Contracts\Routing\ResponseFactory;
use App\Http\Requests\User\UpdateUserPasswordRequest;
use App\Http\Resources\Oasis\SubscriptionRequestResource;
class SubscriptionController extends Controller
{
@@ -32,7 +29,8 @@ class SubscriptionController extends Controller
public function get_subscription_request(SubscriptionRequest $order)
{
return response(
new SubscriptionRequestResource($order), 200
new SubscriptionRequestResource($order),
200
);
}
@@ -62,7 +60,6 @@ class SubscriptionController extends Controller
{
// Make subscription from subscription request
if ($order->exists) {
// Create subscription
$order->user
->newSubscription('main', $order->requested_plan)
@@ -77,7 +74,7 @@ class SubscriptionController extends Controller
}
// Make subscription after user sign up and pay for the plan
if (!$order->exists) {
if (! $order->exists) {
$user = Auth::user();
// Set user billing
@@ -99,7 +96,7 @@ class SubscriptionController extends Controller
$user
->settings()
->update([
'storage_capacity' => $plan['product']['metadata']['capacity'],
'storage_capacity' => $plan['product']['metadata']['capacity'],
'payment_activation' => 1,
]);
@@ -126,7 +123,7 @@ class SubscriptionController extends Controller
// Update status
$order->update([
'status' => 'logged'
'status' => 'logged',
]);
// Log in user

View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Requests\Oasis;
use Illuminate\Foundation\Http\FormRequest;
@@ -24,16 +23,16 @@ class CreateOrderRequest extends FormRequest
public function rules()
{
return [
'ico' => 'sometimes|nullable',
'name' => 'required|string',
'email' => 'required|email|unique:users',
'ico' => 'sometimes|nullable',
'name' => 'required|string',
'email' => 'required|email|unique:users',
'phone_number' => 'string|nullable',
'address' => 'required|string',
'state' => 'required|string',
'city' => 'required|string',
'postal_code' => 'required|string',
'country' => 'required|string',
'plan' => 'required|string',
'address' => 'required|string',
'state' => 'required|string',
'city' => 'required|string',
'postal_code' => 'required|string',
'country' => 'required|string',
'plan' => 'required|string',
];
}
}

View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Requests\Oasis;
use Illuminate\Foundation\Http\FormRequest;
@@ -24,17 +23,17 @@ class StoreClientRequest extends FormRequest
public function rules()
{
return [
'avatar' => 'sometimes|nullable',
'name' => 'required|string',
'email' => 'sometimes|email|nullable',
'avatar' => 'sometimes|nullable',
'name' => 'required|string',
'email' => 'sometimes|email|nullable',
'phone_number' => 'sometimes|string|nullable',
'address' => 'required|string',
'city' => 'required|string',
'postal_code' => 'required|string',
'country' => 'required|string',
'ico' => 'required|string',
'dic' => 'required|string|nullable',
'ic_dph' => 'sometimes|string|nullable',
'address' => 'required|string',
'city' => 'required|string',
'postal_code' => 'required|string',
'country' => 'required|string',
'ico' => 'required|string',
'dic' => 'required|string|nullable',
'ic_dph' => 'sometimes|string|nullable',
];
}
}

View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Requests\Oasis;
use Illuminate\Foundation\Http\FormRequest;
@@ -24,24 +23,24 @@ class StoreInvoiceProfileRequest extends FormRequest
public function rules()
{
return [
'logo' => 'sometimes|file',
'stamp' => 'sometimes|file',
'company' => 'required|string',
'email' => 'required|email',
'ico' => 'sometimes|string|nullable',
'dic' => 'sometimes|string|nullable',
'ic_dph' => 'sometimes|string|nullable',
'logo' => 'sometimes|file',
'stamp' => 'sometimes|file',
'company' => 'required|string',
'email' => 'required|email',
'ico' => 'sometimes|string|nullable',
'dic' => 'sometimes|string|nullable',
'ic_dph' => 'sometimes|string|nullable',
'registration_notes' => 'sometimes|string|nullable',
'author' => 'required|string',
'address' => 'required|string',
'state' => 'required|string',
'city' => 'required|string',
'postal_code' => 'required|string',
'country' => 'required|string',
'phone' => 'required|string',
'bank' => 'required|string',
'iban' => 'required|string',
'swift' => 'required|string',
'author' => 'required|string',
'address' => 'required|string',
'state' => 'required|string',
'city' => 'required|string',
'postal_code' => 'required|string',
'country' => 'required|string',
'phone' => 'required|string',
'bank' => 'required|string',
'iban' => 'required|string',
'swift' => 'required|string',
];
}
}

View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Requests\Oasis;
use Illuminate\Foundation\Http\FormRequest;
@@ -24,14 +23,14 @@ class StoreInvoiceRequest extends FormRequest
public function rules()
{
return [
'invoice_type' => 'required|string',
'invoice_number' => 'required|string',
'invoice_type' => 'required|string',
'invoice_number' => 'required|string',
'variable_number' => 'required|string',
'client' => 'required',
'items' => 'required|array',
'discount_type' => 'sometimes|string',
'discount_rate' => 'sometimes|integer',
'delivery_at' => 'required|date',
'client' => 'required',
'items' => 'required|string',
'discount_type' => 'nullable|string',
'discount_rate' => 'nullable|integer',
'delivery_at' => 'required|date',
];
}
}

View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Resources\Oasis;
use Illuminate\Http\Resources\Json\ResourceCollection;

View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Resources\Oasis;
use Illuminate\Http\Resources\Json\JsonResource;
@@ -16,27 +15,27 @@ class InvoiceProfileResource extends JsonResource
{
return [
'data' => [
'id' => $this->id,
'type' => 'invoice-profile',
'id' => $this->id,
'type' => 'invoice-profile',
'attributes' => [
'logo' => $this->logo,
'stamp' => $this->stamp,
'company' => $this->company,
'email' => $this->email,
'ico' => $this->ico,
'dic' => $this->dic,
'ic_dph' => $this->ic_dph,
'logo' => $this->logo,
'stamp' => $this->stamp,
'company' => $this->company,
'email' => $this->email,
'ico' => $this->ico,
'dic' => $this->dic,
'ic_dph' => $this->ic_dph,
'registration_notes' => $this->registration_notes,
'author' => $this->author,
'address' => $this->address,
'state' => $this->state,
'city' => $this->city,
'postal_code' => $this->postal_code,
'country' => $this->country,
'phone' => $this->phone,
'bank' => $this->bank,
'iban' => $this->iban,
'swift' => $this->swift,
'author' => $this->author,
'address' => $this->address,
'state' => $this->state,
'city' => $this->city,
'postal_code' => $this->postal_code,
'country' => $this->country,
'phone' => $this->phone,
'bank' => $this->bank,
'iban' => $this->iban,
'swift' => $this->swift,
],
],
];

View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Resources\Oasis;
use Illuminate\Http\Resources\Json\ResourceCollection;

View File

@@ -1,10 +1,7 @@
<?php
namespace App\Http\Resources\Oasis;
use Illuminate\Http\Resources\Json\JsonResource;
use Illuminate\Support\Facades\Storage;
use Illuminate\Support\Str;
class OasisInvoiceResource extends JsonResource
{
@@ -18,17 +15,17 @@ class OasisInvoiceResource extends JsonResource
{
return [
'data' => [
'id' => $this->id,
'type' => 'invoice',
'id' => $this->id,
'type' => 'invoice',
'attributes' => [
'name' => $this->client['name'] . ' ' . format_to_currency($this->total_net, $this->currency),
'name' => $this->client['name'] . ' ' . format_to_currency($this->total_net, $this->currency),
'invoiceNumber' => $this->invoice_number,
'total' => format_to_currency($this->total_net, $this->currency),
'file_url' => "/oasis/invoice/$this->id",
'mimetype' => 'pdf',
'created_at' => format_date($this->created_at, '%d. %B. %Y'),
'total' => format_to_currency($this->total_net, $this->currency),
'file_url' => "/oasis/invoice/$this->id",
'mimetype' => 'pdf',
'created_at' => format_date($this->created_at, '%d. %B. %Y'),
],
],
];
}
}
}

View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Resources\Oasis;
use Illuminate\Http\Resources\Json\ResourceCollection;

View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Resources\Oasis;
use Illuminate\Http\Resources\Json\JsonResource;
@@ -23,24 +22,24 @@ class OasisViewClientResource extends JsonResource
->count();
return [
'id' => $this->id,
'type' => 'client',
'id' => $this->id,
'type' => 'client',
'created_at' => format_date($this->created_at, '%d. %B %Y'),
'totalNet' => format_to_currency($total_net, 'CZK'),
'totalNet' => format_to_currency($total_net, 'CZK'),
'totalInvoices' => $total_invoices,
'avatar' => $this->avatar,
'name' => $this->name,
'email' => $this->email,
'avatar' => $this->avatar,
'name' => $this->name,
'email' => $this->email,
'phone_number' => $this->phone_number,
'address' => $this->address,
'city' => $this->city,
'postal_code' => $this->postal_code,
'country' => $this->country,
'ico' => $this->ico,
'dic' => $this->dic,
'ic_dph' => $this->ic_dph,
'address' => $this->address,
'city' => $this->city,
'postal_code' => $this->postal_code,
'country' => $this->country,
'ico' => $this->ico,
'dic' => $this->dic,
'ic_dph' => $this->ic_dph,
];
}
}

View File

@@ -1,5 +1,4 @@
<?php
namespace App\Http\Resources\Oasis;
use Illuminate\Http\Resources\Json\ResourceCollection;

View File

@@ -1,10 +1,7 @@
<?php
namespace App\Http\Resources\Oasis;
use Illuminate\Http\Resources\Json\JsonResource;
use Illuminate\Support\Facades\Storage;
use Illuminate\Support\Str;
class OasisViewInvoiceResource extends JsonResource
{
@@ -17,16 +14,16 @@ class OasisViewInvoiceResource extends JsonResource
public function toArray($request)
{
return [
'id' => $this->id,
'client_id' => $this->client_id,
'name' => $this->client['name'] . ' ' . format_to_currency($this->total_net, $this->currency),
'id' => $this->id,
'client_id' => $this->client_id,
'name' => $this->client['name'] . ' ' . format_to_currency($this->total_net, $this->currency),
'invoiceNumber' => $this->invoice_number,
'total' => format_to_currency($this->total_net, $this->currency),
'file_url' => "/oasis/invoice/$this->id",
'clientName' => $this->client['name'],
'mimetype' => 'pdf',
'type' => 'invoice',
'created_at' => format_date($this->created_at, '%d. %B. %Y'),
'total' => format_to_currency($this->total_net, $this->currency),
'file_url' => "/oasis/invoice/$this->id",
'clientName' => $this->client['name'],
'mimetype' => 'pdf',
'type' => 'invoice',
'created_at' => format_date($this->created_at, '%d. %B. %Y'),
];
}
}
}

View File

@@ -1,12 +1,9 @@
<?php
namespace App\Http\Resources\Oasis;
use App\Http\Resources\PlanResource;
use App\Http\Resources\PricingResource;
use App\Services\StripeService;
use App\Http\Resources\PricingResource;
use Illuminate\Http\Resources\Json\JsonResource;
use Illuminate\Support\Facades\Cache;
class SubscriptionRequestResource extends JsonResource
{
@@ -20,34 +17,34 @@ class SubscriptionRequestResource extends JsonResource
{
return [
'data' => [
'id' => $this->id,
'type' => 'subscription-requests',
'attributes' => [
'requested_plan' => $this->requested_plan,
'status' => $this->status,
'id' => $this->id,
'type' => 'subscription-requests',
'attributes' => [
'requested_plan' => $this->requested_plan,
'status' => $this->status,
'created_at_formatted' => format_date($this->created_at, '%d. %B. %Y'),
],
'relationships' => [
'user' => [
'data' => [
'id' => $this->user->id,
'type' => 'users',
'id' => $this->user->id,
'type' => 'users',
'attributes' => [
'name' => $this->user->settings->name,
'address' => $this->user->settings->address,
'state' => $this->user->settings->state,
'city' => $this->user->settings->city,
'postal_code' => $this->user->settings->postal_code,
'country' => $this->user->settings->country,
'name' => $this->user->settings->name,
'address' => $this->user->settings->address,
'state' => $this->user->settings->state,
'city' => $this->user->settings->city,
'postal_code' => $this->user->settings->postal_code,
'country' => $this->user->settings->country,
'phone_number' => $this->user->settings->phone_number,
'ico' => $this->user->settings->ico,
]
]
'ico' => $this->user->settings->ico,
],
],
],
'plan' => new PricingResource(
resolve(StripeService::class)->getPlan($this->requested_plan)
),
]
],
],
];
}

View File

@@ -48,7 +48,7 @@ class UserResource extends JsonResource
'timezone' => $this->settings->timezone,
// OasisDrive
'payment_activation' => (integer) $this->settings->payment_activation
'payment_activation' => (integer) $this->settings->payment_activation,
],
],
],

View File

@@ -21,7 +21,7 @@ function base64_from_storage_image($filepath)
return null;
}
if (!Storage::exists($filepath)) {
if (! Storage::exists($filepath)) {
return null;
}
@@ -84,7 +84,6 @@ function invoice_total_discount($invoice, $format = false)
{
// Percent discount
if ($invoice['discount_type'] === 'percent') {
$discount = (int) (invoice_total_net($invoice) + invoice_total_tax($invoice)) * ($invoice['discount_rate'] / 100);
if ($format) {
@@ -96,7 +95,6 @@ function invoice_total_discount($invoice, $format = false)
// Value discount
if ($invoice['discount_type'] === 'value') {
if ($format) {
return Cashier::formatAmount($invoice['discount_rate'] * 100, $invoice['currency'], 'cs');
}
@@ -154,4 +152,4 @@ function invoice_total_tax($invoice, $format = false)
function format_to_currency($value, $currency = 'CZK', $locale = 'cs')
{
return Cashier::formatAmount(((int) $value * 100), $currency, $locale);
}
}

View File

@@ -291,7 +291,6 @@ function store_avatar($request, $name)
$image_path = Str::random(16) . '-' . $image->getClientOriginalName();
if (in_array($image->getClientMimeType(), ['image/gif', 'image/jpeg', 'image/jpg', 'image/png', 'image/webp'])) {
// Create intervention image
$img = Image::make($image->getRealPath());
@@ -303,8 +302,7 @@ function store_avatar($request, $name)
}
if ($image->getClientMimeType() === 'image/svg+xml') {
Storage::putFileAs("avatars", $image, $image_path);
Storage::putFileAs('avatars', $image, $image_path);
}
// Return path to image