TheCloneArmy/crater
1
0
Fork 1
mirror of https://github.com/crater-invoice/crater.git synced 2025-12-15 09:52:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix Invoice/Estimate template issues and Add Payment Receipt, Custom Payment Modes and Item units

Browse Source
This commit is contained in:
Jay Makwana
2020-01-05 07:22:36 +00:00
committed by Mohit Panjwani
parent 56a955befd
commit 4c33a5d88c
112 changed files with 5050 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/Payment.php
View File

@@ -5,6 +5,7 @@ use Crater\User;
use Crater\Invoice;
use Carbon\Carbon;
use Illuminate\Database\Eloquent\Model;
use Crater\PaymentMethod;
class Payment extends Model
{
@@ -19,9 +20,11 @@ class Payment extends Model
protected $fillable = [
'user_id',
'invoice_id',
'payment_method_id',
'payment_date',
'company_id',
'notes',
'unique_hash',
'payment_number',
'payment_mode',
'amount'
@@ -84,7 +87,6 @@ class Payment extends Model
return $prefix;
}
public function invoice()
{
return $this->belongsTo(Invoice::class);
@@ -95,6 +97,11 @@ class Payment extends Model
return $this->belongsTo(User::class);
}
public function paymentMethod()
{
return $this->belongsTo(PaymentMethod::class);
}
public function getFormattedCreatedAtAttribute($value)
{
$dateFormat = CompanySetting::getSetting('carbon_date_format', $this->company_id);
@@ -123,9 +130,9 @@ class Payment extends Model
return $query->where('payments.payment_number', 'LIKE', '%'.$paymentNumber.'%');
}
public function scopePaymentMode($query, $paymentMode)
public function scopePaymentMethod($query, $paymentMethodId)
{
return $query->where('payments.payment_mode', $paymentMode);
return $query->where('payments.payment_method_id', $paymentMethodId);
}
public function scopeApplyFilters($query, array $filters)
@@ -140,8 +147,8 @@ class Payment extends Model
$query->paymentNumber($filters->get('payment_number'));
}
if ($filters->get('payment_mode')) {
$query->paymentMode($filters->get('payment_mode'));
if ($filters->get('payment_method_id')) {
$query->paymentMethod($filters->get('payment_method_id'));
}
if ($filters->get('customer_id')) {