diff --git a/app/Http/Requests/Subscription/StoreSubscriptionRequest.php b/app/Http/Requests/Subscription/StoreSubscriptionRequest.php index 84bdc274b6b2..f79ed33f7d7e 100644 --- a/app/Http/Requests/Subscription/StoreSubscriptionRequest.php +++ b/app/Http/Requests/Subscription/StoreSubscriptionRequest.php @@ -34,7 +34,7 @@ class StoreSubscriptionRequest extends Request */ public function rules() { - return [ + $rules = [ 'product_id' => ['sometimes'], 'assigned_user_id' => ['sometimes'], 'is_recurring' => ['sometimes'], @@ -55,6 +55,9 @@ class StoreSubscriptionRequest extends Request 'webhook_configuration' => ['array'], 'name' => ['required', Rule::unique('subscriptions')->where('company_id', auth()->user()->company()->id)] ]; + + return $this->globalRules($rules); + } protected function prepareForValidation() diff --git a/app/Http/Requests/Subscription/UpdateSubscriptionRequest.php b/app/Http/Requests/Subscription/UpdateSubscriptionRequest.php index 4b7a0c4bbe46..c2e5ba47b72f 100644 --- a/app/Http/Requests/Subscription/UpdateSubscriptionRequest.php +++ b/app/Http/Requests/Subscription/UpdateSubscriptionRequest.php @@ -35,8 +35,11 @@ class UpdateSubscriptionRequest extends Request */ public function rules() { - return [ + $rules = [ // ]; + + return $this->globalRules($rules); + } } diff --git a/app/Jobs/Util/Import.php b/app/Jobs/Util/Import.php index 6a06eac4446a..09ddb6b159f7 100644 --- a/app/Jobs/Util/Import.php +++ b/app/Jobs/Util/Import.php @@ -227,6 +227,8 @@ class Import implements ShouldQueue CompanySizeCheck::dispatch(); info('CompletedπŸš€πŸš€πŸš€πŸš€πŸš€ at '.now()); + + unlink($this->file_path); } private function setInitialCompanyLedgerBalances() diff --git a/app/Listeners/Invoice/InvoiceArchivedActivity.php b/app/Listeners/Invoice/InvoiceArchivedActivity.php index 7fd3672b8825..cbb175904773 100644 --- a/app/Listeners/Invoice/InvoiceArchivedActivity.php +++ b/app/Listeners/Invoice/InvoiceArchivedActivity.php @@ -41,6 +41,8 @@ class InvoiceArchivedActivity implements ShouldQueue { MultiDB::setDb($event->company->db); + $event->invoice->service()->deletePdf(); + $fields = new stdClass; $fields->invoice_id = $event->invoice->id; diff --git a/app/Models/Webhook.php b/app/Models/Webhook.php index 1540f87f6604..1372bf03e92c 100644 --- a/app/Models/Webhook.php +++ b/app/Models/Webhook.php @@ -63,6 +63,9 @@ class Webhook extends BaseModel protected $casts = [ 'headers' => 'array', + 'updated_at' => 'timestamp', + 'created_at' => 'timestamp', + 'deleted_at' => 'timestamp', ]; public function user() diff --git a/app/Services/Payment/UpdateInvoicePayment.php b/app/Services/Payment/UpdateInvoicePayment.php index d2fc2eefed5c..0af4a1e4311c 100644 --- a/app/Services/Payment/UpdateInvoicePayment.php +++ b/app/Services/Payment/UpdateInvoicePayment.php @@ -82,6 +82,7 @@ class UpdateInvoicePayment ->updateBalance($paid_amount * -1) ->updatePaidToDate($paid_amount) ->updateStatus() + ->deletePdf() ->save(); InvoiceWorkflowSettings::dispatchNow($invoice); diff --git a/app/Transformers/WebhookTransformer.php b/app/Transformers/WebhookTransformer.php index 8c4f62884ca9..b67686600261 100644 --- a/app/Transformers/WebhookTransformer.php +++ b/app/Transformers/WebhookTransformer.php @@ -34,6 +34,8 @@ class WebhookTransformer extends EntityTransformer 'target_url' => $webhook->target_url ? (string) $webhook->target_url : '', 'event_id' => (string) $webhook->event_id, 'format' => (string) $webhook->format, + 'rest_method' => (string) $webhook->rest_method ?: '', + 'headers' => $webhook->headers ?: [], ]; } }