gitmedia/gruene-seele
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Gutschriften manuell hinzufügen, Yard 0& tax

Browse source
This commit is contained in:
Kevin Adametz 2021-05-12 15:44:48 +02:00
parent e670b92f5d
commit c02fffd883
24 changed files with 497 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/Models/Product.php
View file

@ -283,7 +283,7 @@ class Product extends Model
}
public function setTaxAttribute( $value ) {
$this->attributes['tax'] = $value ? Util::reFormatNumber($value) : null;
$this->attributes['tax'] = $value != "" ? Util::reFormatNumber($value) : null;
}
public function setPriceOldAttribute( $value ) {

2
app/Models/ShoppingOrder.php
View file

@ -97,6 +97,8 @@ use Illuminate\Database\Eloquent\SoftDeletes;
* @property \Illuminate\Support\Carbon|null $shipped_at
* @method static \Illuminate\Database\Eloquent\Builder|ShoppingOrder whereInvoice($value)
* @method static \Illuminate\Database\Eloquent\Builder|ShoppingOrder whereShippedAt($value)
* @property string|null $invoice_number
* @method static \Illuminate\Database\Eloquent\Builder|ShoppingOrder whereInvoiceNumber($value)
*/
class ShoppingOrder extends Model
{

2
app/Models/ShoppingOrderMargin.php
View file

@ -57,6 +57,8 @@ use Illuminate\Database\Eloquent\Model;
* @property-read User|null $m_sponsor
* @method static \Illuminate\Database\Eloquent\Builder|ShoppingOrderMargin wherePartnerCommissionPaid($value)
* @method static \Illuminate\Database\Eloquent\Builder|ShoppingOrderMargin wherePartnerCommissionPendingTo($value)
* @property int|null $user_credit_id
* @method static \Illuminate\Database\Eloquent\Builder|ShoppingOrderMargin whereUserCreditId($value)
*/
class ShoppingOrderMargin extends Model
{

8
app/Models/UserCredit.php
View file

@ -45,6 +45,10 @@ use Illuminate\Database\Eloquent\Model;
* @method static \Illuminate\Database\Eloquent\Builder|UserCredit whereUpdatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserCredit whereUserMargins($value)
* @mixin \Eloquent
* @property string|null $credit_number
* @property string|null $date
* @method static \Illuminate\Database\Eloquent\Builder|UserCredit whereCreditNumber($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserCredit whereDate($value)
*/
class UserCredit extends Model
{
@ -60,7 +64,8 @@ class UserCredit extends Model
'cancellation' => 'bool',
'status' => 'int',
'credit' => 'array',
'user_margins' => 'object'
'user_margins' => 'object',
'user_credits' => 'object'
];
protected $fillable = [
@ -73,6 +78,7 @@ class UserCredit extends Model
'date',
'credit',
'user_margins',
'user_credits',
'paid_out',
'cancellation',
'status'

76
app/Models/UserCreditMargin.php Normal file
View file

@ -0,0 +1,76 @@
<?php
/**
* Created by Reliese Model.
*/
namespace App\Models;
use Carbon\Carbon;
use Illuminate\Database\Eloquent\Model;
/**
* Class UserCreditMargin
*
* @property int $id
* @property int $user_id
* @property float|null $credit
* @property string|null $message
* @property int $status
* @property Carbon|null $created_at
* @property Carbon|null $updated_at
* @property User $user
* @package App\Models
* @property bool|null $paid
* @method static \Illuminate\Database\Eloquent\Builder|UserCreditMargin newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|UserCreditMargin newQuery()
* @method static \Illuminate\Database\Eloquent\Builder|UserCreditMargin query()
* @method static \Illuminate\Database\Eloquent\Builder|UserCreditMargin whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserCreditMargin whereCredit($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserCreditMargin whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserCreditMargin whereMessage($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserCreditMargin wherePaid($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserCreditMargin whereStatus($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserCreditMargin whereUpdatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserCreditMargin whereUserId($value)
* @mixin \Eloquent
*/
class UserCreditMargin extends Model
{
public $statusType = [
1 => 'manually added margin',
];
protected $table = 'user_credit_margins';
protected $casts = [
'user_id' => 'int',
'credit' => 'float',
'status' => 'int',
'paid' => 'bool',
'user_credit_id' => 'int',
];
protected $fillable = [
'user_id',
'credit',
'message',
'status',
'paid',
'user_credit_id',
];
public function user()
{
return $this->belongsTo('App\User','user_id');
}
public function deleteTime(){
$time = '+100 min';
if(Carbon::parse($this->created_at)->modify($time)->gt(Carbon::now())){
return Carbon::now()->diffInMinutes(Carbon::parse($this->created_at)->modify($time));
}
return false;
}
}

20
app/Models/UserPayCredit.php
View file

@ -11,7 +11,7 @@ use Illuminate\Database\Eloquent\Model;
/**
* Class UserPayCredit
*
*
* @property int $id
* @property int $user_id
* @property float|null $credit
@ -22,11 +22,23 @@ use Illuminate\Database\Eloquent\Model;
* @property int|null $shopping_order_id
* @property Carbon|null $created_at
* @property Carbon|null $updated_at
*
* @property ShoppingOrder|null $shopping_order
* @property User $user
*
* @package App\Models
* @method static \Illuminate\Database\Eloquent\Builder|UserPayCredit newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|UserPayCredit newQuery()
* @method static \Illuminate\Database\Eloquent\Builder|UserPayCredit query()
* @method static \Illuminate\Database\Eloquent\Builder|UserPayCredit whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserPayCredit whereCredit($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserPayCredit whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserPayCredit whereMessage($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserPayCredit whereNewCreditTotal($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserPayCredit whereOldCreditTotal($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserPayCredit whereShoppingOrderId($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserPayCredit whereStatus($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserPayCredit whereUpdatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserPayCredit whereUserId($value)
* @mixin \Eloquent
*/
class UserPayCredit extends Model
{
@ -34,6 +46,8 @@ class UserPayCredit extends Model
public $statusType = [
1 => 'add from payment',
2 => 'deduction from payment',
3 => 'manually added credit',
];
protected $table = 'user_pay_credits';