From 7cf3b5d90972d6211a8f815e444552b62d4fbaf1 Mon Sep 17 00:00:00 2001 From: cuneytsenturk Date: Tue, 13 Mar 2018 18:53:18 +0300 Subject: [PATCH] refs #252 --- app/Http/Controllers/Expenses/Bills.php | 13 +++--- app/Http/Controllers/Incomes/Invoices.php | 15 +++---- app/Listeners/Updates/Version1115.php | 51 ----------------------- app/Providers/EventServiceProvider.php | 1 - database/seeds/BillStatuses.php | 5 --- database/seeds/InvoiceStatuses.php | 5 --- resources/lang/en-GB/bills.php | 1 - resources/lang/en-GB/invoices.php | 1 - 8 files changed, 15 insertions(+), 77 deletions(-) delete mode 100644 app/Listeners/Updates/Version1115.php diff --git a/app/Http/Controllers/Expenses/Bills.php b/app/Http/Controllers/Expenses/Bills.php index ef8f39b37..6aff04f61 100644 --- a/app/Http/Controllers/Expenses/Bills.php +++ b/app/Http/Controllers/Expenses/Bills.php @@ -589,26 +589,27 @@ class Bills extends Controller { $bill = Bill::find($payment->bill_id); + $status = 'received'; + if ($bill->payments()->count() > 1) { $bill->bill_status_code = 'partial'; - } else { - $bill->bill_status_code = 'received'; } + $bill->bill_status_code = $status; + $bill->save(); $desc_amount = money((float) $payment->amount, (string) $payment->currency_code, true)->format(); - $description = trans('general.delete') . ' '; - $description .= $desc_amount . ' ' . trans_choice('general.payments', 1); + $description = $desc_amount . ' ' . trans_choice('general.payments', 1); // Add invoice history BillHistory::create([ 'company_id' => $bill->company_id, 'invoice_id' => $bill->id, - 'status_code' => 'delete', + 'status_code' => $status, 'notify' => 0, - 'description' => $description, + 'description' => trans('messages.success.deleted', ['type' => $description]), ]); $payment->delete(); diff --git a/app/Http/Controllers/Incomes/Invoices.php b/app/Http/Controllers/Incomes/Invoices.php index a835774e1..35974fcc8 100644 --- a/app/Http/Controllers/Incomes/Invoices.php +++ b/app/Http/Controllers/Incomes/Invoices.php @@ -722,26 +722,27 @@ class Invoices extends Controller { $invoice = Invoice::find($payment->invoice_id); + $status = 'sent'; + if ($invoice->payments()->count() > 1) { - $invoice->invoice_status_code = 'partial'; - } else { - $invoice->invoice_status_code = 'sent'; + $status = 'partial'; } + $invoice->invoice_status_code = $status; + $invoice->save(); $desc_amount = money((float) $payment->amount, (string) $payment->currency_code, true)->format(); - $description = trans('general.delete') . ' '; - $description .= $desc_amount . ' ' . trans_choice('general.payments', 1); + $description = $desc_amount . ' ' . trans_choice('general.payments', 1); // Add invoice history InvoiceHistory::create([ 'company_id' => $invoice->company_id, 'invoice_id' => $invoice->id, - 'status_code' => 'delete', + 'status_code' => $status, 'notify' => 0, - 'description' => $description, + 'description' => trans('messages.success.deleted', ['type' => $description]), ]); $payment->delete(); diff --git a/app/Listeners/Updates/Version1115.php b/app/Listeners/Updates/Version1115.php deleted file mode 100644 index e1e834cc8..000000000 --- a/app/Listeners/Updates/Version1115.php +++ /dev/null @@ -1,51 +0,0 @@ -check($event)) { - return; - } - - // Create new bill statuses - $companies = Company::all(); - - foreach ($companies as $company) { - $invoice = [ - 'company_id' => $company->id, - 'name' => trans('invoices.status.delete'), - 'code' => 'delete', - ]; - - InvoiceStatus::create($invoice); - - $bill = [ - 'company_id' => $company->id, - 'name' => trans('bills.status.delete'), - 'code' => 'delete', - ]; - - BillStatus::create($bill); - } - } -} diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php index 8a88b29cc..002ecd50c 100644 --- a/app/Providers/EventServiceProvider.php +++ b/app/Providers/EventServiceProvider.php @@ -22,7 +22,6 @@ class EventServiceProvider extends ServiceProvider 'App\Listeners\Updates\Version112', 'App\Listeners\Updates\Version113', 'App\Listeners\Updates\Version119', - 'App\Listeners\Updates\Version1115', ], 'Illuminate\Auth\Events\Login' => [ 'App\Listeners\Auth\Login', diff --git a/database/seeds/BillStatuses.php b/database/seeds/BillStatuses.php index 16d298214..bbd92950b 100644 --- a/database/seeds/BillStatuses.php +++ b/database/seeds/BillStatuses.php @@ -43,11 +43,6 @@ class BillStatuses extends Seeder 'name' => trans('bills.status.partial'), 'code' => 'partial', ], - [ - 'company_id' => $company_id, - 'name' => trans('bills.status.delete'), - 'code' => 'delete', - ], [ 'company_id' => $company_id, 'name' => trans('bills.status.paid'), diff --git a/database/seeds/InvoiceStatuses.php b/database/seeds/InvoiceStatuses.php index 27580bba6..67c175b8d 100644 --- a/database/seeds/InvoiceStatuses.php +++ b/database/seeds/InvoiceStatuses.php @@ -53,11 +53,6 @@ class InvoiceStatuses extends Seeder 'name' => trans('invoices.status.partial'), 'code' => 'partial', ], - [ - 'company_id' => $company_id, - 'name' => trans('invoices.status.delete'), - 'code' => 'delete', - ], [ 'company_id' => $company_id, 'name' => trans('invoices.status.paid'), diff --git a/resources/lang/en-GB/bills.php b/resources/lang/en-GB/bills.php index dadd41d73..407cfc8e5 100644 --- a/resources/lang/en-GB/bills.php +++ b/resources/lang/en-GB/bills.php @@ -31,7 +31,6 @@ return [ 'draft' => 'Draft', 'received' => 'Received', 'partial' => 'Partial', - 'delete' => 'Delete', 'paid' => 'Paid', ], diff --git a/resources/lang/en-GB/invoices.php b/resources/lang/en-GB/invoices.php index e47ceba09..d1a62106d 100644 --- a/resources/lang/en-GB/invoices.php +++ b/resources/lang/en-GB/invoices.php @@ -33,7 +33,6 @@ return [ 'viewed' => 'Viewed', 'approved' => 'Approved', 'partial' => 'Partial', - 'delete' => 'Delete', 'paid' => 'Paid', ],