refactor parse condition

This commit is contained in:
harshjagad20
2021-12-18 13:14:46 +05:30
parent 9652e3bdf5
commit 2765f35f98
6 changed files with 29 additions and 13 deletions

View File

@ -2,7 +2,6 @@
namespace Crater\Models;
use Carbon\Carbon;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
@ -14,6 +13,11 @@ class CustomField extends Model
'id',
];
protected $dates = [
'date_answer',
'date_time_answer'
];
protected $appends = [
'defaultAnswer',
];
@ -25,7 +29,7 @@ class CustomField extends Model
public function setDateAnswerAttribute($value)
{
if ($value && $value != null) {
$this->attributes['date_answer'] = Carbon::parse($value)->format('Y-m-d');
$this->attributes['date_answer'] = $value;
}
}
@ -39,7 +43,7 @@ class CustomField extends Model
public function setDateTimeAnswerAttribute($value)
{
if ($value && $value != null) {
$this->attributes['date_time_answer'] = Carbon::createFromFormat('Y-m-d H:i', $value);
$this->attributes['date_time_answer'] = $value;
}
}

View File

@ -2,7 +2,6 @@
namespace Crater\Models;
use Carbon\Carbon;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
@ -10,6 +9,11 @@ class CustomFieldValue extends Model
{
use HasFactory;
protected $dates = [
'date_answer',
'date_time_answer'
];
protected $guarded = [
'id',
];
@ -21,7 +25,7 @@ class CustomFieldValue extends Model
public function setDateAnswerAttribute($value)
{
if ($value && $value != null) {
$this->attributes['date_answer'] = Carbon::parse($value)->format('Y-m-d');
$this->attributes['date_answer'] = $value;
}
}
@ -37,7 +41,7 @@ class CustomFieldValue extends Model
public function setDateTimeAnswerAttribute($value)
{
if ($value && $value != null) {
$this->attributes['date_time_answer'] = Carbon::createFromFormat('Y-m-d H:i', $value);
$this->attributes['date_time_answer'] = $value;
}
$this->attributes['time_answer'] = null;
}

View File

@ -35,6 +35,8 @@ class Estimate extends Model implements HasMedia
'created_at',
'updated_at',
'deleted_at',
'estimate_date',
'expiry_date'
];
protected $appends = [
@ -57,14 +59,14 @@ class Estimate extends Model implements HasMedia
public function setEstimateDateAttribute($value)
{
if ($value) {
$this->attributes['estimate_date'] = Carbon::parse($value)->format('Y-m-d');
$this->attributes['estimate_date'] = $value;
}
}
public function setExpiryDateAttribute($value)
{
if ($value) {
$this->attributes['expiry_date'] = Carbon::parse($value)->format('Y-m-d');
$this->attributes['expiry_date'] = $value;
}
}

View File

@ -16,6 +16,10 @@ class Expense extends Model implements HasMedia
use InteractsWithMedia;
use HasCustomFieldsTrait;
protected $dates = [
'expense_date',
];
protected $guarded = ['id'];
protected $appends = [
@ -33,7 +37,7 @@ class Expense extends Model implements HasMedia
public function setExpenseDateAttribute($value)
{
if ($value) {
$this->attributes['expense_date'] = Carbon::parse($value)->format('Y-m-d');
$this->attributes['expense_date'] = $value;
}
}

View File

@ -39,6 +39,8 @@ class Invoice extends Model implements HasMedia
'created_at',
'updated_at',
'deleted_at',
'invoice_date',
'due_date'
];
protected $casts = [
@ -64,14 +66,14 @@ class Invoice extends Model implements HasMedia
public function setInvoiceDateAttribute($value)
{
if ($value) {
$this->attributes['invoice_date'] = Carbon::parse($value)->format('Y-m-d');
$this->attributes['invoice_date'] = $value;
}
}
public function setDueDateAttribute($value)
{
if ($value) {
$this->attributes['due_date'] = Carbon::parse($value)->format('Y-m-d');
$this->attributes['due_date'] = $value;
}
}

View File

@ -28,7 +28,7 @@ class Payment extends Model implements HasMedia
public const PAYMENT_MODE_CREDIT_CARD = 'CREDIT_CARD';
public const PAYMENT_MODE_BANK_TRANSFER = 'BANK_TRANSFER';
protected $dates = ['created_at', 'updated_at'];
protected $dates = ['created_at', 'updated_at', 'payment_date'];
protected $guarded = ['id'];
@ -57,7 +57,7 @@ class Payment extends Model implements HasMedia
public function setPaymentDateAttribute($value)
{
if ($value) {
$this->attributes['payment_date'] = Carbon::parse($value)->format('Y-m-d');
$this->attributes['payment_date'] = $value;
}
}