Free Shipping, Business Levels correction, Products Buying, Fonts

This commit is contained in:
Kevin Adametz 2023-01-25 12:37:29 +01:00
parent 3f2fbd6d5b
commit 0341c9c189
197 changed files with 9161 additions and 329 deletions

View file

@ -117,6 +117,12 @@ use Illuminate\Database\Eloquent\SoftDeletes;
* @method static \Illuminate\Database\Eloquent\Builder|Product withUniqueSlugConstraints(\Illuminate\Database\Eloquent\Model $model, string $attribute, array $config, string $slug)
* @property string|null $ean
* @method static \Illuminate\Database\Eloquent\Builder|Product whereEan($value)
* @property bool|null $no_free_shipping
* @property bool|null $buying_restriction
* @property int|null $buying_restriction_amount
* @method static \Illuminate\Database\Eloquent\Builder|Product whereBuyingRestriction($value)
* @method static \Illuminate\Database\Eloquent\Builder|Product whereBuyingRestrictionAmount($value)
* @method static \Illuminate\Database\Eloquent\Builder|Product whereNoFreeShipping($value)
*/
class Product extends Model
{
@ -143,6 +149,9 @@ class Product extends Model
'shipping_addon' => 'bool',
'active' => 'bool',
'no_commission' => 'bool',
'no_free_shipping' => 'bool',
'buying_restriction' => 'bool',
'buying_restriction_amount' => 'int',
];
use Sluggable;
@ -161,6 +170,7 @@ class Product extends Model
'points',
'weight',
'no_commission',
'no_free_shipping',
'contents',
'contents_total',
'unit',
@ -177,6 +187,8 @@ class Product extends Model
'show_at',
'show_on',
'shipping_addon',
'buying_restriction',
'buying_restriction_amount',
'identifier',
'action',
'upgrade_to_id'
@ -245,6 +257,10 @@ class Product extends Model
];
}
public function product_buyings(){
return $this->hasMany('App\Models\ProductBuying', 'product_id', 'id');
}
public function attributes(){
return $this->hasMany('App\Models\ProductAttribute', 'product_id', 'id');
}

View file

@ -0,0 +1,68 @@
<?php
/**
* Created by Reliese Model.
*/
namespace App\Models;
use App\User;
use Carbon\Carbon;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes;
/**
* Class ProductBuying
*
* @property int $id
* @property int $user_id
* @property int $product_id
* @property int $amount
* @property string|null $deleted_at
* @property Carbon|null $created_at
* @property Carbon|null $updated_at
* @property Product $product
* @property User $user
* @package App\Models
* @method static \Illuminate\Database\Eloquent\Builder|ProductBuying newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|ProductBuying newQuery()
* @method static \Illuminate\Database\Query\Builder|ProductBuying onlyTrashed()
* @method static \Illuminate\Database\Eloquent\Builder|ProductBuying query()
* @method static \Illuminate\Database\Eloquent\Builder|ProductBuying whereAmount($value)
* @method static \Illuminate\Database\Eloquent\Builder|ProductBuying whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|ProductBuying whereDeletedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|ProductBuying whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|ProductBuying whereProductId($value)
* @method static \Illuminate\Database\Eloquent\Builder|ProductBuying whereUpdatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|ProductBuying whereUserId($value)
* @method static \Illuminate\Database\Query\Builder|ProductBuying withTrashed()
* @method static \Illuminate\Database\Query\Builder|ProductBuying withoutTrashed()
* @mixin \Eloquent
*/
class ProductBuying extends Model
{
use SoftDeletes;
protected $table = 'product_buyings';
protected $casts = [
'user_id' => 'int',
'product_id' => 'int',
'amount' => 'int'
];
protected $fillable = [
'user_id',
'product_id',
'amount'
];
public function product()
{
return $this->belongsTo(Product::class);
}
public function user()
{
return $this->belongsTo(User::class);
}
}

View file

@ -114,7 +114,7 @@ class ShoppingCollectOrder extends Model
public function addTaxToSplit($tax_rate, $add_tax)
{
$tax_split = $this->tax_split;
$tax_split[$tax_rate] = isset($tax_split[$tax_rate]) ? round($tax_split[$tax_rate] += $add_tax, 2) : $add_tax;
$tax_split[$tax_rate] = isset($tax_split[$tax_rate]) ? round($tax_split[$tax_rate] += $add_tax, 2) : round($add_tax, 2);
$this->tax_split = $tax_split;
}

View file

@ -115,6 +115,8 @@ use Illuminate\Database\Eloquent\SoftDeletes;
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\ShoppingUser whereShoppingUserId($value)
* @property int|null $homeparty_id
* @method static \Illuminate\Database\Eloquent\Builder|ShoppingUser whereHomepartyId($value)
* @property int|null $shopping_collect_order_id
* @method static \Illuminate\Database\Eloquent\Builder|ShoppingUser whereShoppingCollectOrderId($value)
*/
class ShoppingUser extends Model
{

View file

@ -125,6 +125,12 @@ use Carbon\Carbon;
* @method static \Illuminate\Database\Eloquent\Builder|UserAccount whereReverseCharge($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserAccount whereReverseChargeCode($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserAccount whereReverseChargeValid($value)
* @property string|null $bank_owner
* @property string|null $bank_iban
* @property string|null $bank_bic
* @method static \Illuminate\Database\Eloquent\Builder|UserAccount whereBankBic($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserAccount whereBankIban($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserAccount whereBankOwner($value)
*/
class UserAccount extends Model
{

View file

@ -6,10 +6,96 @@
namespace App\Models;
use App\User;
use Carbon\Carbon;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Casts\AsArrayObject;
/**
* App\Models\UserBusiness
*
* @property int $id
* @property int $user_id
* @property int $month
* @property int $year
* @property int|null $b_structure_id
* @property int|null $m_level_id
* @property int|null $m_sponsor_id
* @property object|null $sponsor
* @property string|null $m_sponsor_name
* @property string|null $user_level_name
* @property bool $active_account
* @property \Illuminate\Support\Carbon|null $payment_account_date
* @property \Illuminate\Support\Carbon|null $active_date
* @property int|null $m_account
* @property string|null $email
* @property string|null $first_name
* @property string|null $last_name
* @property int|null $sales_volume_points
* @property int|null $sales_volume_points_shop
* @property int|null $sales_volume_points_sum
* @property float|null $sales_volume_total
* @property float|null $sales_volume_total_shop
* @property float|null $sales_volume_total_sum
* @property int|null $margin
* @property int|null $margin_shop
* @property int|null $qual_kp
* @property int|null $qual_tp
* @property int|null $total_tp
* @property int|null $total_qual_tp
* @property string|null $commission_lines_total
* @property float|null $commission_shop_sales
* @property float|null $commission_team_total
* @property mixed|null $business_lines
* @property mixed|null $user_items
* @property array|null $qual_user_level
* @property \Illuminate\Support\Carbon|null $created_at
* @property \Illuminate\Support\Carbon|null $updated_at
* @property-read \App\Models\UserBusinessStructure|null $user_business_structure
* @method static \Illuminate\Database\Eloquent\Builder|UserBusiness newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|UserBusiness newQuery()
* @method static \Illuminate\Database\Eloquent\Builder|UserBusiness query()
* @method static \Illuminate\Database\Eloquent\Builder|UserBusiness whereActiveAccount($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserBusiness whereActiveDate($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserBusiness whereBStructureId($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserBusiness whereBusinessLines($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserBusiness whereCommissionLinesTotal($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserBusiness whereCommissionShopSales($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserBusiness whereCommissionTeamTotal($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserBusiness whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserBusiness whereEmail($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserBusiness whereFirstName($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserBusiness whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserBusiness whereLastName($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserBusiness whereMAccount($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserBusiness whereMLevelId($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserBusiness whereMSponsorId($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserBusiness whereMSponsorName($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserBusiness whereMargin($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserBusiness whereMarginShop($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserBusiness whereMonth($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserBusiness wherePaymentAccountDate($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserBusiness whereQualKp($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserBusiness whereQualTp($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserBusiness whereQualUserLevel($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserBusiness whereSalesVolumePoints($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserBusiness whereSalesVolumePointsShop($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserBusiness whereSalesVolumePointsSum($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserBusiness whereSalesVolumeTotal($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserBusiness whereSalesVolumeTotalShop($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserBusiness whereSalesVolumeTotalSum($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserBusiness whereSponsor($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserBusiness whereTotalQualTp($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserBusiness whereTotalTp($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserBusiness whereUpdatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserBusiness whereUserId($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserBusiness whereUserItems($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserBusiness whereUserLevelName($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserBusiness whereYear($value)
* @mixin \Eloquent
* @property array|null $next_qual_user_level
* @method static \Illuminate\Database\Eloquent\Builder|UserBusiness whereNextQualUserLevel($value)
*/
class UserBusiness extends Model
{
protected $table = 'user_businesses';
@ -28,8 +114,8 @@ class UserBusiness extends Model
'sales_volume_total' => 'float',
'sales_volume_total_shop' => 'float',
'sales_volume_total_sum' => 'float',
'margin' => 'int',
'margin_shop' => 'int',
'margin' => 'float',
'margin_shop' => 'float',
'qual_kp' => 'int',
'qual_tp' => 'int',
'total_tp' => 'int',
@ -37,6 +123,7 @@ class UserBusiness extends Model
'commission_team_total' => 'float',
'commission_shop_sales' => 'float',
'qual_user_level' => 'array',
'next_qual_user_level' => 'array',
'sponsor' => 'object',
'business_lines' => AsArrayObject::class,
'user_items' => AsArrayObject::class
@ -73,6 +160,7 @@ class UserBusiness extends Model
'qual_kp',
'qual_tp',
'qual_user_level',
'next_qual_user_level',
'total_tp',
'total_qual_tp',
'commission_team_total',
@ -81,6 +169,11 @@ class UserBusiness extends Model
'user_items',
];
public function user()
{
return $this->belongsTo(User::class);
}
public function user_business_structure()
{
return $this->belongsTo(UserBusinessStructure::class, 'b_structure_id');

View file

@ -14,7 +14,7 @@ use Illuminate\Database\Eloquent\SoftDeletes;
/**
* Class UserCredit
*
*
* @property int $id
* @property int $user_id
* @property int|null $month
@ -39,11 +39,43 @@ use Illuminate\Database\Eloquent\SoftDeletes;
* @property Carbon|null $created_at
* @property Carbon|null $updated_at
* @property string|null $deleted_at
*
* @property User $user
* @property Collection|UserCreditItem[] $user_credit_items
*
* @package App\Models
* @property bool $taxable
* @property-read int|null $user_credit_items_count
* @method static \Illuminate\Database\Eloquent\Builder|UserCredit newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|UserCredit newQuery()
* @method static \Illuminate\Database\Query\Builder|UserCredit onlyTrashed()
* @method static \Illuminate\Database\Eloquent\Builder|UserCredit query()
* @method static \Illuminate\Database\Eloquent\Builder|UserCredit whereCancellation($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserCredit whereCancellationDate($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserCredit whereCancellationId($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserCredit whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserCredit whereDate($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserCredit whereDeletedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserCredit whereDir($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserCredit whereDisk($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserCredit whereFilename($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserCredit whereFullNumber($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserCredit whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserCredit whereInfos($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserCredit whereMonth($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserCredit whereNet($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserCredit whereNumber($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserCredit wherePaidOut($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserCredit wherePaidOutDate($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserCredit whereStatus($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserCredit whereTax($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserCredit whereTaxRate($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserCredit whereTaxable($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserCredit whereTotal($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserCredit whereUpdatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserCredit whereUserId($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserCredit whereYear($value)
* @method static \Illuminate\Database\Query\Builder|UserCredit withTrashed()
* @method static \Illuminate\Database\Query\Builder|UserCredit withoutTrashed()
* @mixin \Eloquent
*/
class UserCredit extends Model
{

View file

@ -12,7 +12,7 @@ use Illuminate\Database\Eloquent\Model;
/**
* Class UserCreditItem
*
*
* @property int $id
* @property int $user_id
* @property int|null $user_credit_id
@ -22,11 +22,24 @@ use Illuminate\Database\Eloquent\Model;
* @property bool $paid
* @property Carbon|null $created_at
* @property Carbon|null $updated_at
*
* @property UserCredit|null $user_credit
* @property User $user
*
* @package App\Models
* @property int|null $user_business_id
* @method static \Illuminate\Database\Eloquent\Builder|UserCreditItem newModelQuery()
* @method static \Illuminate\Database\Eloquent\Builder|UserCreditItem newQuery()
* @method static \Illuminate\Database\Eloquent\Builder|UserCreditItem query()
* @method static \Illuminate\Database\Eloquent\Builder|UserCreditItem whereCreatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserCreditItem whereCredit($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserCreditItem whereId($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserCreditItem whereMessage($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserCreditItem wherePaid($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserCreditItem whereStatus($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserCreditItem whereUpdatedAt($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserCreditItem whereUserBusinessId($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserCreditItem whereUserCreditId($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserCreditItem whereUserId($value)
* @mixin \Eloquent
*/
class UserCreditItem extends Model
{
@ -54,6 +67,7 @@ class UserCreditItem extends Model
protected $casts = [
'user_id' => 'int',
'user_credit_id' => 'int',
'user_business_id' => 'int',
'credit' => 'float',
'status' => 'int',
'paid' => 'bool'
@ -62,6 +76,7 @@ class UserCreditItem extends Model
protected $fillable = [
'user_id',
'user_credit_id',
'user_business_id',
'credit',
'message',
'status',

View file

@ -25,6 +25,7 @@ use App\User;
* @property float|null $total_net
* @property float|null $month_total_net
* @property string|null $message
* @property string|null $info
* @property int $status
* @property Carbon|null $created_at
* @property Carbon|null $updated_at
@ -58,6 +59,7 @@ use App\User;
* @mixin \Eloquent
* @property array|null $syslog
* @method static \Illuminate\Database\Eloquent\Builder|UserSalesVolume whereSyslog($value)
* @method static \Illuminate\Database\Eloquent\Builder|UserSalesVolume whereInfo($value)
*/
class UserSalesVolume extends Model
{
@ -97,6 +99,7 @@ class UserSalesVolume extends Model
'month_total_net',
'month_shop_total_net',
'message',
'info',
'status',
'syslog'
];