Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-31 23:24:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Minor fixes

Browse Source
This commit is contained in:
David Bomba 2021-03-09 21:30:34 +11:00
parent 0a3b5e0665
commit cd48ae78f9
6 changed files with 247 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

241
app/Http/Controllers/BillingSubscriptionController.php
View File

@ -130,6 +130,45 @@ class BillingSubscriptionController extends BaseController
return $this->itemResponse($billing_subscription); return $this->itemResponse($billing_subscription);
} }
/**
* Store a newly created resource in storage.
*
* @param StoreBillingSubscriptionRequest $request The request
*
* @return Response
*
*
* @OA\Post(
* path="/api/v1/billing_subscriptions",
* operationId="storeBillingSubscription",
* tags={"billing_subscriptions"},
* summary="Adds a billing_subscriptions",
* description="Adds an billing_subscriptions to the system",
* @OA\Parameter(ref="#/components/parameters/X-Api-Secret"),
* @OA\Parameter(ref="#/components/parameters/X-Api-Token"),
* @OA\Parameter(ref="#/components/parameters/X-Requested-With"),
* @OA\Parameter(ref="#/components/parameters/include"),
* @OA\Response(
* response=200,
* description="Returns the saved billing_subscriptions object",
* @OA\Header(header="X-MINIMUM-CLIENT-VERSION", ref="#/components/headers/X-MINIMUM-CLIENT-VERSION"),
* @OA\Header(header="X-RateLimit-Remaining", ref="#/components/headers/X-RateLimit-Remaining"),
* @OA\Header(header="X-RateLimit-Limit", ref="#/components/headers/X-RateLimit-Limit"),
* @OA\JsonContent(ref="#/components/schemas/BillingSubscription"),
* ),
* @OA\Response(
* response=422,
* description="Validation error",
* @OA\JsonContent(ref="#/components/schemas/ValidationError"),
*
* ),
* @OA\Response(
* response="default",
* description="Unexpected Error",
* @OA\JsonContent(ref="#/components/schemas/Error"),
* ),
* )
*/
public function store(StoreBillingSubscriptionRequest $request): \Illuminate\Http\Response public function store(StoreBillingSubscriptionRequest $request): \Illuminate\Http\Response
{ {
$billing_subscription = $this->billing_subscription_repo->save($request->all(), BillingSubscriptionFactory::create(auth()->user()->company()->id, auth()->user()->id)); $billing_subscription = $this->billing_subscription_repo->save($request->all(), BillingSubscriptionFactory::create(auth()->user()->company()->id, auth()->user()->id));
@ -139,16 +178,168 @@ class BillingSubscriptionController extends BaseController
return $this->itemResponse($billing_subscription); return $this->itemResponse($billing_subscription);
} }
/**
* Display the specified resource.
*
* @param ShowBillingSubscriptionRequest $request The request
* @param Invoice $billing_subscription The invoice
*
* @return Response
*
*
* @OA\Get(
* path="/api/v1/billing_subscriptions/{id}",
* operationId="showBillingSubscription",
* tags={"billing_subscriptions"},
* summary="Shows an billing_subscriptions",
* description="Displays an billing_subscriptions by id",
* @OA\Parameter(ref="#/components/parameters/X-Api-Secret"),
* @OA\Parameter(ref="#/components/parameters/X-Api-Token"),
* @OA\Parameter(ref="#/components/parameters/X-Requested-With"),
* @OA\Parameter(ref="#/components/parameters/include"),
* @OA\Parameter(
* name="id",
* in="path",
* description="The BillingSubscription Hashed ID",
* example="D2J234DFA",
* required=true,
* @OA\Schema(
* type="string",
* format="string",
* ),
* ),
* @OA\Response(
* response=200,
* description="Returns the BillingSubscription object",
* @OA\Header(header="X-MINIMUM-CLIENT-VERSION", ref="#/components/headers/X-MINIMUM-CLIENT-VERSION"),
* @OA\Header(header="X-RateLimit-Remaining", ref="#/components/headers/X-RateLimit-Remaining"),
* @OA\Header(header="X-RateLimit-Limit", ref="#/components/headers/X-RateLimit-Limit"),
* @OA\JsonContent(ref="#/components/schemas/BillingSubscription"),
* ),
* @OA\Response(
* response=422,
* description="Validation error",
* @OA\JsonContent(ref="#/components/schemas/ValidationError"),
*
* ),
* @OA\Response(
* response="default",
* description="Unexpected Error",
* @OA\JsonContent(ref="#/components/schemas/Error"),
* ),
* )
*/
public function show(ShowBillingSubscriptionRequest $request, BillingSubscription $billing_subscription): \Illuminate\Http\Response public function show(ShowBillingSubscriptionRequest $request, BillingSubscription $billing_subscription): \Illuminate\Http\Response
{ {
return $this->itemResponse($billing_subscription); return $this->itemResponse($billing_subscription);
} }
/**
* Show the form for editing the specified resource.
*
* @param EditBillingSubscriptionRequest $request The request
* @param Invoice $billing_subscription The invoice
*
* @return Response
*
* @OA\Get(
* path="/api/v1/billing_subscriptions/{id}/edit",
* operationId="editBillingSubscription",
* tags={"billing_subscriptions"},
* summary="Shows an billing_subscriptions for editting",
* description="Displays an billing_subscriptions by id",
* @OA\Parameter(ref="#/components/parameters/X-Api-Secret"),
* @OA\Parameter(ref="#/components/parameters/X-Api-Token"),
* @OA\Parameter(ref="#/components/parameters/X-Requested-With"),
* @OA\Parameter(ref="#/components/parameters/include"),
* @OA\Parameter(
* name="id",
* in="path",
* description="The BillingSubscription Hashed ID",
* example="D2J234DFA",
* required=true,
* @OA\Schema(
* type="string",
* format="string",
* ),
* ),
* @OA\Response(
* response=200,
* description="Returns the invoice object",
* @OA\Header(header="X-MINIMUM-CLIENT-VERSION", ref="#/components/headers/X-MINIMUM-CLIENT-VERSION"),
* @OA\Header(header="X-RateLimit-Remaining", ref="#/components/headers/X-RateLimit-Remaining"),
* @OA\Header(header="X-RateLimit-Limit", ref="#/components/headers/X-RateLimit-Limit"),
* @OA\JsonContent(ref="#/components/schemas/BillingSubscription"),
* ),
* @OA\Response(
* response=422,
* description="Validation error",
* @OA\JsonContent(ref="#/components/schemas/ValidationError"),
*
* ),
* @OA\Response(
* response="default",
* description="Unexpected Error",
* @OA\JsonContent(ref="#/components/schemas/Error"),
* ),
* )
*/
public function edit(EditBillingSubscriptionRequest $request, BillingSubscription $billing_subscription): \Illuminate\Http\Response public function edit(EditBillingSubscriptionRequest $request, BillingSubscription $billing_subscription): \Illuminate\Http\Response
{ {
return $this->itemResponse($billing_subscription); return $this->itemResponse($billing_subscription);
} }
/**
* Update the specified resource in storage.
*
* @param UpdateBillingSubscriptionRequest $request The request
* @param BillingSubscription $billing_subscription The invoice
*
* @return Response
*
*
* @OA\Put(
* path="/api/v1/billing_subscriptions/{id}",
* operationId="updateBillingSubscription",
* tags={"billing_subscriptions"},
* summary="Updates an billing_subscriptions",
* description="Handles the updating of an billing_subscriptions by id",
* @OA\Parameter(ref="#/components/parameters/X-Api-Secret"),
* @OA\Parameter(ref="#/components/parameters/X-Api-Token"),
* @OA\Parameter(ref="#/components/parameters/X-Requested-With"),
* @OA\Parameter(ref="#/components/parameters/include"),
* @OA\Parameter(
* name="id",
* in="path",
* description="The BillingSubscription Hashed ID",
* example="D2J234DFA",
* required=true,
* @OA\Schema(
* type="string",
* format="string",
* ),
* ),
* @OA\Response(
* response=200,
* description="Returns the billing_subscriptions object",
* @OA\Header(header="X-MINIMUM-CLIENT-VERSION", ref="#/components/headers/X-MINIMUM-CLIENT-VERSION"),
* @OA\Header(header="X-RateLimit-Remaining", ref="#/components/headers/X-RateLimit-Remaining"),
* @OA\Header(header="X-RateLimit-Limit", ref="#/components/headers/X-RateLimit-Limit"),
* @OA\JsonContent(ref="#/components/schemas/BillingSubscription"),
* ),
* @OA\Response(
* response=422,
* description="Validation error",
* @OA\JsonContent(ref="#/components/schemas/ValidationError"),
*
* ),
* @OA\Response(
* response="default",
* description="Unexpected Error",
* @OA\JsonContent(ref="#/components/schemas/Error"),
* ),
* )
*/
public function update(UpdateBillingSubscriptionRequest $request, BillingSubscription $billing_subscription) public function update(UpdateBillingSubscriptionRequest $request, BillingSubscription $billing_subscription)
{ {
if ($request->entityIsDeleted($billing_subscription)) { if ($request->entityIsDeleted($billing_subscription)) {
@ -160,6 +351,56 @@ class BillingSubscriptionController extends BaseController
return $this->itemResponse($billing_subscription); return $this->itemResponse($billing_subscription);
} }
/**
* Remove the specified resource from storage.
*
* @param DestroyBillingSubscriptionRequest $request
* @param BillingSubscription $invoice
*
* @return Response
*
* @throws \Exception
* @OA\Delete(
* path="/api/v1/billing_subscriptions/{id}",
* operationId="deleteBillingSubscription",
* tags={"billing_subscriptions"},
* summary="Deletes a billing_subscriptions",
* description="Handles the deletion of an billing_subscriptions by id",
* @OA\Parameter(ref="#/components/parameters/X-Api-Secret"),
* @OA\Parameter(ref="#/components/parameters/X-Api-Token"),
* @OA\Parameter(ref="#/components/parameters/X-Requested-With"),
* @OA\Parameter(ref="#/components/parameters/include"),
* @OA\Parameter(
* name="id",
* in="path",
* description="The BillingSubscription Hashed ID",
* example="D2J234DFA",
* required=true,
* @OA\Schema(
* type="string",
* format="string",
* ),
* ),
* @OA\Response(
* response=200,
* description="Returns a HTTP status",
* @OA\Header(header="X-MINIMUM-CLIENT-VERSION", ref="#/components/headers/X-MINIMUM-CLIENT-VERSION"),
* @OA\Header(header="X-RateLimit-Remaining", ref="#/components/headers/X-RateLimit-Remaining"),
* @OA\Header(header="X-RateLimit-Limit", ref="#/components/headers/X-RateLimit-Limit"),
* ),
* @OA\Response(
* response=422,
* description="Validation error",
* @OA\JsonContent(ref="#/components/schemas/ValidationError"),
*
* ),
* @OA\Response(
* response="default",
* description="Unexpected Error",
* @OA\JsonContent(ref="#/components/schemas/Error"),
* ),
* )
*/
public function destroy(DestroyBillingSubscriptionRequest $request, BillingSubscription $billing_subscription): \Illuminate\Http\Response public function destroy(DestroyBillingSubscriptionRequest $request, BillingSubscription $billing_subscription): \Illuminate\Http\Response
{ {
$this->billing_subscription_repo->delete($billing_subscription); $this->billing_subscription_repo->delete($billing_subscription);

4
app/Http/Controllers/OpenAPI/BillingSubscription.php
View File

@ -11,8 +11,8 @@
* @OA\Property(property="is_recurring", type="boolean", example="true", description="______"), * @OA\Property(property="is_recurring", type="boolean", example="true", description="______"),
* @OA\Property(property="frequency_id", type="string", example="1", description="integer const representation of the frequency"), * @OA\Property(property="frequency_id", type="string", example="1", description="integer const representation of the frequency"),
* @OA\Property(property="auto_bill", type="string", example="always", description="enum setting"), * @OA\Property(property="auto_bill", type="string", example="always", description="enum setting"),
* @OA\Property(property="promo_code", type="string", example="100OFF", description="______"), * @OA\Property(property="promo_code", type="string", example="PROMOCODE4U", description="______"),
* @OA\Property(property="promo_discount", type="float", example=10, description="______"), * @OA\Property(property="promo_discount", type="number", example=10, description="______"),
* @OA\Property(property="is_amount_discount", type="boolean", example="true", description="______"), * @OA\Property(property="is_amount_discount", type="boolean", example="true", description="______"),
* @OA\Property(property="allow_cancellation", type="boolean", example="true", description="______"), * @OA\Property(property="allow_cancellation", type="boolean", example="true", description="______"),
* @OA\Property(property="per_seat_enabled", type="boolean", example="true", description="______"), * @OA\Property(property="per_seat_enabled", type="boolean", example="true", description="______"),

2
app/Http/Controllers/RecurringInvoiceController.php
View File

@ -439,7 +439,7 @@ class RecurringInvoiceController extends BaseController
/** /**
* @OA\Get( * @OA\Get(
* path="/api/v1/recurring_invoice/{invitation_key}/download", * path="/api/v1/recurring_invoice/{invitation_key}/download",
* operationId="downloadInvoice", * operationId="downloadRecurringInvoice",
* tags={"invoices"}, * tags={"invoices"},
* summary="Download a specific invoice by invitation key", * summary="Download a specific invoice by invitation key",
* description="Downloads a specific invoice", * description="Downloads a specific invoice",

2
app/Http/Controllers/TwoFactorController.php
View File

@ -38,7 +38,7 @@ class TwoFactorController extends BaseController
$data = [ $data = [
'secret' => $secret, 'secret' => $secret,
'qrCode' => $qrCode, 'qrCode' => $qr_code,
]; ];
return response()->json(['data' => $data], 200); return response()->json(['data' => $data], 200);

8
app/Http/Middleware/PasswordProtection.php
View File

@ -31,18 +31,12 @@ class PasswordProtection
*/ */
public function handle($request, Closure $next) public function handle($request, Closure $next)
{ {
// {nlog($request->headers->all());
// nlog($request->all());
$error = [ $error = [
'message' => 'Invalid Password', 'message' => 'Invalid Password',
'errors' => new stdClass, 'errors' => new stdClass,
]; ];
nlog(Cache::get(auth()->user()->hashed_id.'_logged_in'));
nlog($request->header('X-API-OAUTH-PASSWORD'));
if (Cache::get(auth()->user()->hashed_id.'_logged_in')) { if (Cache::get(auth()->user()->hashed_id.'_logged_in')) {
Cache::pull(auth()->user()->hashed_id.'_logged_in'); Cache::pull(auth()->user()->hashed_id.'_logged_in');
@ -94,4 +88,4 @@ class PasswordProtection
} }
} }

2
config/queue.php
View File

@ -13,7 +13,7 @@ return [
| |
*/ */
'default' => env('QUEUE_CONNECTION', 'database'), 'default' => env('QUEUE_CONNECTION', 'sync'),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------