diff --git a/app/Http/Controllers/PaymentController.php b/app/Http/Controllers/PaymentController.php index 385c5e5eda54..92bf5bf84cfa 100644 --- a/app/Http/Controllers/PaymentController.php +++ b/app/Http/Controllers/PaymentController.php @@ -205,6 +205,8 @@ class PaymentController extends BaseController { $payment = $this->payment_repo->save($request->all(), PaymentFactory::create(auth()->user()->company()->id, auth()->user()->id)); + event('eloquent.created: App\Models\Payment', $payment); + return $this->itemResponse($payment); } @@ -378,6 +380,8 @@ class PaymentController extends BaseController event(new PaymentWasUpdated($payment, $payment->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null))); + event('eloquent.updated: App\Models\Payment', $payment); + return $this->itemResponse($payment); } diff --git a/app/Jobs/Util/WebhookSingle.php b/app/Jobs/Util/WebhookSingle.php index d9d76cfc9ce2..6c76c56b68c3 100644 --- a/app/Jobs/Util/WebhookSingle.php +++ b/app/Jobs/Util/WebhookSingle.php @@ -243,11 +243,19 @@ class WebhookSingle implements ShouldQueue } private function resolveClient() - { + { nlog(get_class($this->entity)); + //make sure it isn't an instance of the Client Model - if ($this->entity->client()->exists()) { + if (!$this->entity instanceof \App\Models\Client && + !$this->entity instanceof \App\Models\Vendor && + !$this->entity instanceof \App\Models\Product && + !$this->entity instanceof \App\Models\PurchaseOrder && + $this->entity->client()->exists()) { + return $this->entity->client; + } + return null; } diff --git a/app/Models/Credit.php b/app/Models/Credit.php index 5534fbd3fd1d..060301f525ad 100644 --- a/app/Models/Credit.php +++ b/app/Models/Credit.php @@ -249,18 +249,18 @@ class Credit extends BaseModel if ($this->balance == 0) { $this->status_id = self::STATUS_APPLIED; - $this->save(); + $this->saveQuietly(); return; } - $this->save(); + $this->saveQuietly(); } public function setStatus($status) { $this->status_id = $status; - $this->save(); + $this->saveQuietly(); } public function pdf_file_path($invitation = null, string $type = 'path', bool $portal = false) @@ -313,7 +313,7 @@ class Credit extends BaseModel $this->invitations->each(function ($invitation) { if (! isset($invitation->sent_date)) { $invitation->sent_date = Carbon::now(); - $invitation->save(); + $invitation->saveQuietly(); } }); } diff --git a/app/Models/PurchaseOrder.php b/app/Models/PurchaseOrder.php index b98cbfe3a446..cb369b180a78 100644 --- a/app/Models/PurchaseOrder.php +++ b/app/Models/PurchaseOrder.php @@ -141,6 +141,10 @@ class PurchaseOrder extends BaseModel } } + public function getEntityType() + { + return self::class; + } public function assigned_user() { @@ -186,7 +190,7 @@ class PurchaseOrder extends BaseModel $this->invitations->each(function ($invitation) { if (! isset($invitation->sent_date)) { $invitation->sent_date = Carbon::now(); - $invitation->save(); + $invitation->saveQuietly(); } }); } diff --git a/app/Models/Webhook.php b/app/Models/Webhook.php index 25885a2bee79..27d6e81b7dab 100644 --- a/app/Models/Webhook.php +++ b/app/Models/Webhook.php @@ -66,75 +66,75 @@ class Webhook extends BaseModel const EVENT_REMIND_INVOICE = 24; - const EVENT_PROJECT_CREATE = 25;// + const EVENT_PROJECT_CREATE = 25; //tested - const EVENT_PROJECT_UPDATE = 26; + const EVENT_PROJECT_UPDATE = 26; //tested - const EVENT_CREATE_CREDIT = 27; + const EVENT_CREATE_CREDIT = 27; //tested - const EVENT_UPDATE_CREDIT = 28; + const EVENT_UPDATE_CREDIT = 28; //tested - const EVENT_DELETE_CREDIT = 29; + const EVENT_DELETE_CREDIT = 29; //tested - const EVENT_PROJECT_DELETE = 30; + const EVENT_PROJECT_DELETE = 30; //tested - const EVENT_UPDATE_PAYMENT = 31; + const EVENT_UPDATE_PAYMENT = 31; //tested - const EVENT_ARCHIVE_PAYMENT = 32; + const EVENT_ARCHIVE_PAYMENT = 32; //tested const EVENT_ARCHIVE_INVOICE = 33; //tested - const EVENT_ARCHIVE_QUOTE = 34; + const EVENT_ARCHIVE_QUOTE = 34; //tested - const EVENT_ARCHIVE_CREDIT = 35; + const EVENT_ARCHIVE_CREDIT = 35; //tested - const EVENT_ARCHIVE_TASK = 36; + const EVENT_ARCHIVE_TASK = 36; //tested - const EVENT_ARCHIVE_CLIENT = 37; + const EVENT_ARCHIVE_CLIENT = 37; //tested - const EVENT_ARCHIVE_PROJECT = 38; + const EVENT_ARCHIVE_PROJECT = 38; //tested - const EVENT_ARCHIVE_EXPENSE = 39; + const EVENT_ARCHIVE_EXPENSE = 39; //tested - const EVENT_RESTORE_PAYMENT = 40; + const EVENT_RESTORE_PAYMENT = 40; //tested - const EVENT_RESTORE_INVOICE = 41; + const EVENT_RESTORE_INVOICE = 41; //tested - const EVENT_RESTORE_QUOTE = 42; + const EVENT_RESTORE_QUOTE = 42; ///tested - const EVENT_RESTORE_CREDIT = 43; + const EVENT_RESTORE_CREDIT = 43; //tested - const EVENT_RESTORE_TASK = 44; + const EVENT_RESTORE_TASK = 44; //tested - const EVENT_RESTORE_CLIENT = 45; + const EVENT_RESTORE_CLIENT = 45; //tested - const EVENT_RESTORE_PROJECT = 46; + const EVENT_RESTORE_PROJECT = 46; //tested - const EVENT_RESTORE_EXPENSE = 47; + const EVENT_RESTORE_EXPENSE = 47; //tested - const EVENT_ARCHIVE_VENDOR = 48; + const EVENT_ARCHIVE_VENDOR = 48; //tested - const EVENT_RESTORE_VENDOR = 49; + const EVENT_RESTORE_VENDOR = 49; //tested - const EVENT_CREATE_PRODUCT = 50; + const EVENT_CREATE_PRODUCT = 50; //tested - const EVENT_UPDATE_PRODUCT = 51; + const EVENT_UPDATE_PRODUCT = 51; //tested - const EVENT_DELETE_PRODUCT = 52; + const EVENT_DELETE_PRODUCT = 52; //tested - const EVENT_RESTORE_PRODUCT = 53; + const EVENT_RESTORE_PRODUCT = 53; //tested - const EVENT_ARCHIVE_PRODUCT = 54; + const EVENT_ARCHIVE_PRODUCT = 54; //tested - const EVENT_CREATE_PURCHASE_ORDER = 55; + const EVENT_CREATE_PURCHASE_ORDER = 55; //tested - const EVENT_UPDATE_PURCHASE_ORDER = 56; + const EVENT_UPDATE_PURCHASE_ORDER = 56; //tested - const EVENT_DELETE_PURCHASE_ORDER = 57; + const EVENT_DELETE_PURCHASE_ORDER = 57; //tested - const EVENT_RESTORE_PURCHASE_ORDER = 58; + const EVENT_RESTORE_PURCHASE_ORDER = 58; //tested - const EVENT_ARCHIVE_PURCHASE_ORDER = 59; + const EVENT_ARCHIVE_PURCHASE_ORDER = 59; //tested public static $valid_events = [ self::EVENT_CREATE_PURCHASE_ORDER, diff --git a/app/Observers/ClientObserver.php b/app/Observers/ClientObserver.php index 7bece9b40364..be5af38a02d2 100644 --- a/app/Observers/ClientObserver.php +++ b/app/Observers/ClientObserver.php @@ -32,7 +32,7 @@ class ClientObserver ->exists(); if ($subscriptions) - WebhookHandler::dispatch(Webhook::EVENT_CREATE_CLIENT, $client, $client->company)->delay(rand(1,5)); + WebhookHandler::dispatch(Webhook::EVENT_CREATE_CLIENT, $client, $client->company)->delay(0); } @@ -59,7 +59,7 @@ class ClientObserver ->exists(); if ($subscriptions) - WebhookHandler::dispatch($event, $client, $client->company)->delay(rand(1,5)); + WebhookHandler::dispatch($event, $client, $client->company)->delay(0); } @@ -80,7 +80,7 @@ class ClientObserver ->exists(); if ($subscriptions) - WebhookHandler::dispatch(Webhook::EVENT_ARCHIVE_CLIENT, $client, $client->company)->delay(rand(1,5)); + WebhookHandler::dispatch(Webhook::EVENT_ARCHIVE_CLIENT, $client, $client->company)->delay(0); } diff --git a/app/Observers/CreditObserver.php b/app/Observers/CreditObserver.php index 9645251a756b..43fc322fe4bd 100644 --- a/app/Observers/CreditObserver.php +++ b/app/Observers/CreditObserver.php @@ -30,12 +30,12 @@ class CreditObserver */ public function created(Credit $credit) { - $subscriptions = Webhook::where('company_id', $credit->company->id) + $subscriptions = Webhook::where('company_id', $credit->company_id) ->where('event_id', Webhook::EVENT_CREATE_CREDIT) ->exists(); if ($subscriptions) { - WebhookHandler::dispatch(Webhook::EVENT_CREATE_CREDIT, $credit, $credit->company)->delay(rand(1,5)); + WebhookHandler::dispatch(Webhook::EVENT_CREATE_CREDIT, $credit, $credit->company)->delay(0); } } @@ -55,12 +55,12 @@ class CreditObserver if($credit->is_deleted) $event = Webhook::EVENT_DELETE_CREDIT; - $subscriptions = Webhook::where('company_id', $credit->company->id) + $subscriptions = Webhook::where('company_id', $credit->company_id) ->where('event_id', $event) ->exists(); if ($subscriptions) - WebhookHandler::dispatch($event, $credit, $credit->company)->delay(rand(1,5)); + WebhookHandler::dispatch($event, $credit, $credit->company)->delay(0); } @@ -75,12 +75,12 @@ class CreditObserver if($credit->is_deleted) return; - $subscriptions = Webhook::where('company_id', $credit->company->id) + $subscriptions = Webhook::where('company_id', $credit->company_id) ->where('event_id', Webhook::EVENT_ARCHIVE_CREDIT) ->exists(); if ($subscriptions) - WebhookHandler::dispatch(Webhook::EVENT_ARCHIVE_CREDIT, $credit, $credit->company)->delay(rand(1,5)); + WebhookHandler::dispatch(Webhook::EVENT_ARCHIVE_CREDIT, $credit, $credit->company)->delay(0); } diff --git a/app/Observers/ExpenseObserver.php b/app/Observers/ExpenseObserver.php index f398f44e01da..84ec3e7d6cf9 100644 --- a/app/Observers/ExpenseObserver.php +++ b/app/Observers/ExpenseObserver.php @@ -32,7 +32,7 @@ class ExpenseObserver ->exists(); if ($subscriptions) - WebhookHandler::dispatch(Webhook::EVENT_CREATE_EXPENSE, $expense, $expense->company)->delay(rand(1,5)); + WebhookHandler::dispatch(Webhook::EVENT_CREATE_EXPENSE, $expense, $expense->company)->delay(0); } @@ -58,7 +58,7 @@ class ExpenseObserver ->exists(); if ($subscriptions) - WebhookHandler::dispatch($event, $expense, $expense->company)->delay(rand(1,5)); + WebhookHandler::dispatch($event, $expense, $expense->company)->delay(0); } @@ -78,7 +78,7 @@ class ExpenseObserver ->exists(); if ($subscriptions) - WebhookHandler::dispatch(Webhook::EVENT_ARCHIVE_EXPENSE, $expense, $expense->company)->delay(rand(1,5)); + WebhookHandler::dispatch(Webhook::EVENT_ARCHIVE_EXPENSE, $expense, $expense->company)->delay(0); } diff --git a/app/Observers/InvoiceObserver.php b/app/Observers/InvoiceObserver.php index 9caa003e02ca..18523e49a71e 100644 --- a/app/Observers/InvoiceObserver.php +++ b/app/Observers/InvoiceObserver.php @@ -32,7 +32,7 @@ class InvoiceObserver ->exists(); if ($subscriptions) { - WebhookHandler::dispatch(Webhook::EVENT_CREATE_INVOICE, $invoice, $invoice->company, 'client')->delay(rand(1,5)); + WebhookHandler::dispatch(Webhook::EVENT_CREATE_INVOICE, $invoice, $invoice->company, 'client')->delay(0); } } @@ -58,7 +58,7 @@ class InvoiceObserver ->exists(); if ($subscriptions) - WebhookHandler::dispatch($event, $invoice, $invoice->company)->delay(rand(1,5)); + WebhookHandler::dispatch($event, $invoice, $invoice->company)->delay(0); } /** @@ -77,7 +77,7 @@ class InvoiceObserver ->exists(); if ($subscriptions) - WebhookHandler::dispatch(Webhook::EVENT_ARCHIVE_INVOICE, $invoice, $invoice->company, 'client')->delay(rand(1,5)); + WebhookHandler::dispatch(Webhook::EVENT_ARCHIVE_INVOICE, $invoice, $invoice->company, 'client')->delay(0); } diff --git a/app/Observers/PaymentObserver.php b/app/Observers/PaymentObserver.php index 744ca853bfa4..8b31dffdddad 100644 --- a/app/Observers/PaymentObserver.php +++ b/app/Observers/PaymentObserver.php @@ -59,7 +59,7 @@ class PaymentObserver ->exists(); if ($subscriptions) - WebhookHandler::dispatch($event, $payment, $payment->company, 'invoices,client')->delay(20); + WebhookHandler::dispatch($event, $payment, $payment->company, 'invoices,client')->delay(25); } /** diff --git a/app/Observers/ProductObserver.php b/app/Observers/ProductObserver.php index 64254260014c..0ef5cac0d575 100644 --- a/app/Observers/ProductObserver.php +++ b/app/Observers/ProductObserver.php @@ -33,7 +33,7 @@ class ProductObserver ->exists(); if ($subscriptions) - WebhookHandler::dispatch(Webhook::EVENT_CREATE_PRODUCT, $product, $product->company)->delay(rand(1,5)); + WebhookHandler::dispatch(Webhook::EVENT_CREATE_PRODUCT, $product, $product->company)->delay(0); } /** @@ -59,7 +59,7 @@ class ProductObserver ->exists(); if ($subscriptions) - WebhookHandler::dispatch($event, $product, $product->company)->delay(rand(1,5)); + WebhookHandler::dispatch($event, $product, $product->company)->delay(0); } @@ -79,7 +79,7 @@ class ProductObserver ->exists(); if ($subscriptions) - WebhookHandler::dispatch(Webhook::EVENT_ARCHIVE_PRODUCT, $product, $product->company)->delay(rand(1,5)); + WebhookHandler::dispatch(Webhook::EVENT_ARCHIVE_PRODUCT, $product, $product->company)->delay(0); } /** diff --git a/app/Observers/ProjectObserver.php b/app/Observers/ProjectObserver.php index eece39f6dd7f..41f3028a8649 100644 --- a/app/Observers/ProjectObserver.php +++ b/app/Observers/ProjectObserver.php @@ -32,7 +32,7 @@ class ProjectObserver ->exists(); if ($subscriptions) - WebhookHandler::dispatch(Webhook::EVENT_PROJECT_CREATE, $project, $project->company, 'client')->delay(rand(1,5)); + WebhookHandler::dispatch(Webhook::EVENT_PROJECT_CREATE, $project, $project->company, 'client')->delay(0); } @@ -59,7 +59,7 @@ class ProjectObserver ->exists(); if ($subscriptions) - WebhookHandler::dispatch($event, $project, $project->company, 'client')->delay(rand(1,5)); + WebhookHandler::dispatch($event, $project, $project->company, 'client')->delay(0); } @@ -79,7 +79,7 @@ class ProjectObserver ->exists(); if ($subscriptions) - WebhookHandler::dispatch(Webhook::EVENT_ARCHIVE_PROJECT, $project, $project->company, 'client')->delay(rand(1,5)); + WebhookHandler::dispatch(Webhook::EVENT_ARCHIVE_PROJECT, $project, $project->company, 'client')->delay(0); } diff --git a/app/Observers/PurchaseOrderObserver.php b/app/Observers/PurchaseOrderObserver.php index d7e83bd44fce..b6675c0d74a5 100644 --- a/app/Observers/PurchaseOrderObserver.php +++ b/app/Observers/PurchaseOrderObserver.php @@ -34,7 +34,7 @@ class PurchaseOrderObserver ->exists(); if ($subscriptions) - WebhookHandler::dispatch(Webhook::EVENT_CREATE_PURCHASE_ORDER, $purchase_order, $purchase_order->company, 'vendor')->delay(rand(1,5)); + WebhookHandler::dispatch(Webhook::EVENT_CREATE_PURCHASE_ORDER, $purchase_order, $purchase_order->company, 'vendor')->delay(0); } @@ -61,7 +61,7 @@ class PurchaseOrderObserver ->exists(); if ($subscriptions) - WebhookHandler::dispatch($event, $purchase_order, $purchase_order->company, 'vendor')->delay(rand(1,5)); + WebhookHandler::dispatch($event, $purchase_order, $purchase_order->company, 'vendor')->delay(0); } @@ -81,7 +81,7 @@ class PurchaseOrderObserver ->exists(); if ($subscriptions) - WebhookHandler::dispatch(Webhook::EVENT_ARCHIVE_PURCHASE_ORDER, $purchase_order, $purchase_order->company, 'vendor')->delay(rand(1,5)); + WebhookHandler::dispatch(Webhook::EVENT_ARCHIVE_PURCHASE_ORDER, $purchase_order, $purchase_order->company, 'vendor')->delay(0); } diff --git a/app/Observers/QuoteObserver.php b/app/Observers/QuoteObserver.php index bc2f50c0373a..cb83d069aa80 100644 --- a/app/Observers/QuoteObserver.php +++ b/app/Observers/QuoteObserver.php @@ -34,7 +34,7 @@ class QuoteObserver ->exists(); if ($subscriptions) - WebhookHandler::dispatch(Webhook::EVENT_CREATE_QUOTE, $quote, $quote->company, 'client')->delay(rand(1,5)); + WebhookHandler::dispatch(Webhook::EVENT_CREATE_QUOTE, $quote, $quote->company, 'client')->delay(0); } @@ -61,7 +61,7 @@ class QuoteObserver ->exists(); if ($subscriptions) - WebhookHandler::dispatch($event, $quote, $quote->company, 'client')->delay(rand(1,5)); + WebhookHandler::dispatch($event, $quote, $quote->company, 'client')->delay(0); } @@ -81,7 +81,7 @@ class QuoteObserver ->exists(); if ($subscriptions) - WebhookHandler::dispatch(Webhook::EVENT_ARCHIVE_QUOTE, $quote, $quote->company, 'client')->delay(rand(1,5)); + WebhookHandler::dispatch(Webhook::EVENT_ARCHIVE_QUOTE, $quote, $quote->company, 'client')->delay(0); } diff --git a/app/Observers/TaskObserver.php b/app/Observers/TaskObserver.php index 8d314ba1195f..ff3e6d1a0260 100644 --- a/app/Observers/TaskObserver.php +++ b/app/Observers/TaskObserver.php @@ -33,7 +33,7 @@ class TaskObserver ->exists(); if ($subscriptions) - WebhookHandler::dispatch(Webhook::EVENT_CREATE_TASK, $task, $task->company)->delay(rand(1,5)); + WebhookHandler::dispatch(Webhook::EVENT_CREATE_TASK, $task, $task->company)->delay(0); } @@ -59,7 +59,7 @@ class TaskObserver ->exists(); if ($subscriptions) - WebhookHandler::dispatch($event, $task, $task->company)->delay(rand(1,5)); + WebhookHandler::dispatch($event, $task, $task->company)->delay(0); } /** @@ -78,7 +78,7 @@ class TaskObserver ->exists(); if ($subscriptions) - WebhookHandler::dispatch(Webhook::EVENT_ARCHIVE_TASK, $task, $task->company)->delay(rand(1,5)); + WebhookHandler::dispatch(Webhook::EVENT_ARCHIVE_TASK, $task, $task->company)->delay(0); } diff --git a/app/Observers/VendorObserver.php b/app/Observers/VendorObserver.php index 5449ba1d5c77..4e280a4a64a3 100644 --- a/app/Observers/VendorObserver.php +++ b/app/Observers/VendorObserver.php @@ -33,7 +33,7 @@ class VendorObserver ->exists(); if ($subscriptions) - WebhookHandler::dispatch(Webhook::EVENT_CREATE_VENDOR, $vendor, $vendor->company)->delay(rand(1,5)); + WebhookHandler::dispatch(Webhook::EVENT_CREATE_VENDOR, $vendor, $vendor->company)->delay(0); } @@ -59,7 +59,7 @@ class VendorObserver ->exists(); if ($subscriptions) - WebhookHandler::dispatch($event, $vendor, $vendor->company)->delay(rand(1,5)); + WebhookHandler::dispatch($event, $vendor, $vendor->company)->delay(0); } /** @@ -78,7 +78,7 @@ class VendorObserver ->exists(); if ($subscriptions) { - WebhookHandler::dispatch(Webhook::EVENT_ARCHIVE_VENDOR, $vendor, $vendor->company)->delay(rand(1,5)); + WebhookHandler::dispatch(Webhook::EVENT_ARCHIVE_VENDOR, $vendor, $vendor->company)->delay(0); } } diff --git a/app/Repositories/PaymentRepository.php b/app/Repositories/PaymentRepository.php index 6170d8aa66d3..7d06feb822d6 100644 --- a/app/Repositories/PaymentRepository.php +++ b/app/Repositories/PaymentRepository.php @@ -85,14 +85,14 @@ class PaymentRepository extends BaseRepository { } $client->service()->updatePaidToDate($data['amount'])->save(); - $client->save(); + $client->saveQuietly(); } else{ //this fixes an edge case with unapplied payments $client->service()->updatePaidToDate($data['amount'])->save(); // $client->paid_to_date += $data['amount']; - $client->save(); + $client->saveQuietly(); } if (array_key_exists('credits', $data) && is_array($data['credits']) && count($data['credits']) > 0) { @@ -100,7 +100,7 @@ class PaymentRepository extends BaseRepository { $client->service()->updatePaidToDate($_credit_totals)->save(); // $client->paid_to_date += $_credit_totals; - $client->save(); + $client->saveQuietly(); } }, 1); @@ -121,7 +121,7 @@ class PaymentRepository extends BaseRepository { } - $payment->save(); + $payment->saveQuietly(); /*Save documents*/ if (array_key_exists('documents', $data)) { @@ -198,17 +198,7 @@ class PaymentRepository extends BaseRepository { $payment->applied += ($invoice_totals - $credit_totals); //wont work because - check tests - $payment->save(); - - $transaction = [ - 'invoice' => [], - 'payment' => $payment->transaction_event(), - 'client' => $payment->client->transaction_event(), - 'credit' => [], - 'metadata' => [], - ]; - - // TransactionLog::dispatch(TransactionEvent::PAYMENT_MADE, $transaction, $payment->company->db); + $payment->saveQuietly(); return $payment->refresh(); } diff --git a/app/Repositories/PurchaseOrderRepository.php b/app/Repositories/PurchaseOrderRepository.php index d813bb67dfaa..e1b514b25ca0 100644 --- a/app/Repositories/PurchaseOrderRepository.php +++ b/app/Repositories/PurchaseOrderRepository.php @@ -67,7 +67,7 @@ class PurchaseOrderRepository extends BaseRepository $new_invitation->purchase_order_id = $purchase_order->id; $new_invitation->vendor_contact_id = $contact->id; $new_invitation->key = $this->createDbHash($purchase_order->company->db); - $new_invitation->save(); + $new_invitation->saveQuietly(); } } } diff --git a/app/Services/Client/ClientService.php b/app/Services/Client/ClientService.php index e76c9d809d50..ad74f22c0c84 100644 --- a/app/Services/Client/ClientService.php +++ b/app/Services/Client/ClientService.php @@ -207,7 +207,7 @@ class ClientService */ public function save() :Client { - $this->client->save(); + $this->client->saveQuietly(); return $this->client->fresh(); } diff --git a/app/Services/Invoice/HandleRestore.php b/app/Services/Invoice/HandleRestore.php index ff7f5a245588..a61f42dccfb2 100644 --- a/app/Services/Invoice/HandleRestore.php +++ b/app/Services/Invoice/HandleRestore.php @@ -139,7 +139,7 @@ class HandleRestore extends AbstractService $payment->applied += $payment_adjustment; $payment->is_deleted = false; $payment->restore(); - $payment->save(); + $payment->saveQuietly(); }); return $this; diff --git a/app/Services/PurchaseOrder/MarkSent.php b/app/Services/PurchaseOrder/MarkSent.php index b1cc2ce6a556..6d4446ba9946 100644 --- a/app/Services/PurchaseOrder/MarkSent.php +++ b/app/Services/PurchaseOrder/MarkSent.php @@ -41,7 +41,6 @@ class MarkSent ->setStatus(PurchaseOrder::STATUS_SENT) ->applyNumber() ->adjustBalance($this->purchase_order->amount) //why was this commented out previously? - // ->touchPdf() ->save(); return $this->purchase_order; diff --git a/app/Services/PurchaseOrder/PurchaseOrderExpense.php b/app/Services/PurchaseOrder/PurchaseOrderExpense.php index 3f6c17344fc9..bb65fffe3fff 100644 --- a/app/Services/PurchaseOrder/PurchaseOrderExpense.php +++ b/app/Services/PurchaseOrder/PurchaseOrderExpense.php @@ -60,9 +60,10 @@ class PurchaseOrderExpense $expense->number = empty($expense->number) ? $this->getNextExpenseNumber($expense) : $expense->number; $expense->save(); + event('eloquent.created: App\Models\Expense', $expense); $this->purchase_order->expense_id = $expense->id; - $this->purchase_order->save(); + $this->purchase_order->saveQuietly(); return $expense;