diff --git a/app/Factory/ExpenseCategoryFactory.php b/app/Factory/ExpenseCategoryFactory.php index 00a6d28bcb9e..ef85e48e4dea 100644 --- a/app/Factory/ExpenseCategoryFactory.php +++ b/app/Factory/ExpenseCategoryFactory.php @@ -22,7 +22,8 @@ class ExpenseCategoryFactory $expense->company_id = $company_id; $expense->name = ''; $expense->is_deleted = false; - + $expense->color = '#fff'; + return $expense; } } diff --git a/app/Factory/RecurringInvoiceToInvoiceFactory.php b/app/Factory/RecurringInvoiceToInvoiceFactory.php index 8e9057ddee82..6bcc52add5b8 100644 --- a/app/Factory/RecurringInvoiceToInvoiceFactory.php +++ b/app/Factory/RecurringInvoiceToInvoiceFactory.php @@ -43,7 +43,7 @@ class RecurringInvoiceToInvoiceFactory $invoice->custom_value3 = $recurring_invoice->custom_value3; $invoice->custom_value4 = $recurring_invoice->custom_value4; $invoice->amount = $recurring_invoice->amount; - $invoice->balance = $recurring_invoice->balance; + // $invoice->balance = $recurring_invoice->balance; $invoice->user_id = $recurring_invoice->user_id; $invoice->assigned_user_id = $recurring_invoice->assigned_user_id; $invoice->company_id = $recurring_invoice->company_id; diff --git a/app/Factory/TaskStatusFactory.php b/app/Factory/TaskStatusFactory.php index fa564d4bb977..ffcff72af0dd 100644 --- a/app/Factory/TaskStatusFactory.php +++ b/app/Factory/TaskStatusFactory.php @@ -21,6 +21,7 @@ class TaskStatusFactory $task_status->user_id = $user_id; $task_status->company_id = $company_id; $task_status->name = ''; + $task_status->color = '#fff'; return $task_status; } diff --git a/app/Http/Controllers/ClientPortal/InvoiceController.php b/app/Http/Controllers/ClientPortal/InvoiceController.php index 3eb8a885a886..0ae249cf8bee 100644 --- a/app/Http/Controllers/ClientPortal/InvoiceController.php +++ b/app/Http/Controllers/ClientPortal/InvoiceController.php @@ -119,7 +119,9 @@ class InvoiceController extends Controller 'hashed_ids' => $invoices->pluck('hashed_id'), 'total' => $total, ]; -nlog($data); + +// nlog($data); + return $this->render('invoices.payment', $data); } diff --git a/app/Http/Controllers/InvoiceController.php b/app/Http/Controllers/InvoiceController.php index 4a75d6d0f46f..a986afc1a28a 100644 --- a/app/Http/Controllers/InvoiceController.php +++ b/app/Http/Controllers/InvoiceController.php @@ -508,10 +508,7 @@ class InvoiceController extends BaseController */ public function bulk() { - - /* - * WIP! - */ + $action = request()->input('action'); $ids = request()->input('ids'); diff --git a/app/Http/Controllers/TaskStatusController.php b/app/Http/Controllers/TaskStatusController.php index 76e593f9da80..ccb9533a06ec 100644 --- a/app/Http/Controllers/TaskStatusController.php +++ b/app/Http/Controllers/TaskStatusController.php @@ -174,8 +174,11 @@ class TaskStatusController extends BaseController */ public function store(StoreTaskStatusRequest $request) { + nlog($request->all()); + $task_status = TaskStatusFactory::create(auth()->user()->company()->id, auth()->user()->id); $task_status->fill($request->all()); + $task_status->save(); return $this->itemResponse($task_status->fresh()); diff --git a/app/Http/Requests/Expense/StoreExpenseRequest.php b/app/Http/Requests/Expense/StoreExpenseRequest.php index df5185a7bcd5..bffb4012c265 100644 --- a/app/Http/Requests/Expense/StoreExpenseRequest.php +++ b/app/Http/Requests/Expense/StoreExpenseRequest.php @@ -62,6 +62,9 @@ class StoreExpenseRequest extends Request $input['currency_id'] = (string)auth()->user()->company()->settings->currency_id; } + if(array_key_exists('color', $input) && is_null($input['color'])) + $input['color'] = '#fff'; + $this->replace($input); } diff --git a/app/Http/Requests/Project/StoreProjectRequest.php b/app/Http/Requests/Project/StoreProjectRequest.php index cbd5a6ce276b..baa10e61d961 100644 --- a/app/Http/Requests/Project/StoreProjectRequest.php +++ b/app/Http/Requests/Project/StoreProjectRequest.php @@ -49,6 +49,10 @@ class StoreProjectRequest extends Request { $input = $this->decodePrimaryKeys($this->all()); + + if(array_key_exists('color', $input) && is_null($input['color'])) + $input['color'] = '#fff'; + $this->replace($input); } diff --git a/app/Http/Requests/Project/UpdateProjectRequest.php b/app/Http/Requests/Project/UpdateProjectRequest.php index 4980b99276aa..6c8c3f9fe9b4 100644 --- a/app/Http/Requests/Project/UpdateProjectRequest.php +++ b/app/Http/Requests/Project/UpdateProjectRequest.php @@ -48,6 +48,9 @@ class UpdateProjectRequest extends Request unset($input['client_id']); } + if(array_key_exists('color', $input) && is_null($input['color'])) + $input['color'] = '#fff'; + $this->replace($input); } } diff --git a/app/Http/Requests/Task/UpdateTaskRequest.php b/app/Http/Requests/Task/UpdateTaskRequest.php index 207a0173d74e..06bd80cbc6a6 100644 --- a/app/Http/Requests/Task/UpdateTaskRequest.php +++ b/app/Http/Requests/Task/UpdateTaskRequest.php @@ -50,6 +50,9 @@ class UpdateTaskRequest extends Request $input['status_id'] = $this->decodePrimaryKey($input['status_id']); } + if(array_key_exists('color', $input) && is_null($input['color'])) + $input['color'] = '#fff'; + $this->replace($input); } } diff --git a/app/Http/Requests/TaskStatus/StoreTaskStatusRequest.php b/app/Http/Requests/TaskStatus/StoreTaskStatusRequest.php index ec3e44f4675d..ca58e64a3372 100644 --- a/app/Http/Requests/TaskStatus/StoreTaskStatusRequest.php +++ b/app/Http/Requests/TaskStatus/StoreTaskStatusRequest.php @@ -32,6 +32,9 @@ class StoreTaskStatusRequest extends Request { $input = $this->all(); + if(array_key_exists('color', $input) && is_null($input['color'])) + $input['color'] = '#fff'; + $this->replace($input); } diff --git a/app/Http/Requests/TaskStatus/UpdateTaskStatusRequest.php b/app/Http/Requests/TaskStatus/UpdateTaskStatusRequest.php index 0b0667a51c86..3b799d21e118 100644 --- a/app/Http/Requests/TaskStatus/UpdateTaskStatusRequest.php +++ b/app/Http/Requests/TaskStatus/UpdateTaskStatusRequest.php @@ -38,4 +38,14 @@ class UpdateTaskStatusRequest extends Request return $rules; } + + protected function prepareForValidation() + { + $input = $this->all(); + + if(array_key_exists('color', $input) && is_null($input['color'])) + $input['color'] = '#fff'; + + $this->replace($input); + } } diff --git a/app/Jobs/Entity/CreateEntityPdf.php b/app/Jobs/Entity/CreateEntityPdf.php index f7d8cc7cce2a..a21fc5d63c4f 100644 --- a/app/Jobs/Entity/CreateEntityPdf.php +++ b/app/Jobs/Entity/CreateEntityPdf.php @@ -168,8 +168,12 @@ class CreateEntityPdf implements ShouldQueue return $file_path; } - public function failed(\Exception $exception) + public function failed($e) { - nlog("help!"); + } + // public function failed(\Exception $exception) + // { + // nlog("help!"); + // } } diff --git a/app/Jobs/RecurringInvoice/SendRecurring.php b/app/Jobs/RecurringInvoice/SendRecurring.php index 2418bf41296e..ea75bd00d5a9 100644 --- a/app/Jobs/RecurringInvoice/SendRecurring.php +++ b/app/Jobs/RecurringInvoice/SendRecurring.php @@ -58,7 +58,7 @@ class SendRecurring implements ShouldQueue $invoice = RecurringInvoiceToInvoiceFactory::create($this->recurring_invoice, $this->recurring_invoice->client); $invoice->date = now()->format('Y-m-d'); - + $invoice = $invoice->service() ->markSent() ->applyNumber() diff --git a/app/Models/TaskStatus.php b/app/Models/TaskStatus.php index 915893e04b8e..d87d06fca47f 100644 --- a/app/Models/TaskStatus.php +++ b/app/Models/TaskStatus.php @@ -29,5 +29,10 @@ class TaskStatus extends BaseModel */ protected $dates = ['deleted_at']; - protected $fillable = ['name','color','status_order']; + protected $fillable = [ + 'name', + 'color', + 'status_order', + ]; + } diff --git a/app/Repositories/Migration/InvoiceMigrationRepository.php b/app/Repositories/Migration/InvoiceMigrationRepository.php index 832af28d8e44..9fff645bf7f0 100644 --- a/app/Repositories/Migration/InvoiceMigrationRepository.php +++ b/app/Repositories/Migration/InvoiceMigrationRepository.php @@ -97,7 +97,7 @@ class InvoiceMigrationRepository extends BaseRepository } foreach ($data['invitations'] as $invitation) { - nlog($invitation); + // nlog($invitation); $new_invitation = $invitation_factory_class::create($model->company_id, $model->user_id); $new_invitation->{$lcfirst_resource_id} = $model->id; diff --git a/database/factories/TaskStatusFactory.php b/database/factories/TaskStatusFactory.php index a04d679d6888..babef656a9b0 100644 --- a/database/factories/TaskStatusFactory.php +++ b/database/factories/TaskStatusFactory.php @@ -31,6 +31,7 @@ class TaskStatusFactory extends Factory { return [ 'name' => $this->faker->text(7), + 'color' => '#fff', ]; } } diff --git a/tests/Feature/CompanyGatewayResolutionTest.php b/tests/Feature/CompanyGatewayResolutionTest.php index 2860b57961ad..5b37ef4b9f70 100644 --- a/tests/Feature/CompanyGatewayResolutionTest.php +++ b/tests/Feature/CompanyGatewayResolutionTest.php @@ -104,8 +104,8 @@ class CompanyGatewayResolutionTest extends TestCase { $fee = $this->cg->calcGatewayFee(10, GatewayType::CREDIT_CARD, false); $this->assertEquals(0.2, $fee); - $fee = $this->cg->calcGatewayFee(10, GatewayType::CREDIT_CARD, false); - $this->assertEquals(0.1, $fee); + // $fee = $this->cg->calcGatewayFee(10, GatewayType::CREDIT_CARD, false); + // $this->assertEquals(0.1, $fee); } /**