Gutschriften manuell hinzufügen, Yard 0& tax
This commit is contained in:
parent
e670b92f5d
commit
c02fffd883
24 changed files with 497 additions and 68 deletions
|
|
@ -3,6 +3,7 @@ namespace App\Services;
|
|||
|
||||
|
||||
use App\Models\ShoppingOrderMargin;
|
||||
use App\Models\UserCreditMargin;
|
||||
use App\User;
|
||||
use Carbon;
|
||||
|
||||
|
|
@ -101,11 +102,10 @@ class UserMarign
|
|||
if($format){
|
||||
$sum_net_amount = Util::formatNumber($sum_net_amount);
|
||||
}
|
||||
|
||||
return $sum_net_amount;
|
||||
}
|
||||
|
||||
public static function getMontlyPartnerCommissionOpenByID($user_id, $date = null, $format = false){
|
||||
public static function getMontlyPartnerCommissionOpenByID($user_id, $date = null, $format = false, $addUserCreditMargin = false){
|
||||
|
||||
$sum_net_amount = ShoppingOrderMargin::whereMSponsorId($user_id)
|
||||
->wherePaid(true)
|
||||
|
|
@ -113,6 +113,13 @@ class UserMarign
|
|||
->wherePartnerCommissionPaid(false)
|
||||
->where('partner_commission_pending_to', '<', Carbon::now())
|
||||
->sum('net_partner_commission');
|
||||
if($addUserCreditMargin){
|
||||
$sum_net_credit = UserCreditMargin::whereUserId($user_id)
|
||||
->wherePaid(false)
|
||||
->sum('credit');
|
||||
$sum_net_amount += $sum_net_credit;
|
||||
}
|
||||
|
||||
if($format){
|
||||
$sum_net_amount = Util::formatNumber($sum_net_amount);
|
||||
}
|
||||
|
|
@ -170,6 +177,15 @@ class UserMarign
|
|||
return $ShoppingOrderMargins;
|
||||
}
|
||||
|
||||
public static function getUserCreditMarginByID($user_id){
|
||||
|
||||
$UserCreditMargin = UserCreditMargin::whereUserId($user_id)
|
||||
->wherePaid(false)
|
||||
->get();
|
||||
|
||||
return $UserCreditMargin;
|
||||
}
|
||||
|
||||
public static function getOrderFromPartnerCommissionPendingByID($user_id){
|
||||
|
||||
$ShoppingOrderMargins = ShoppingOrderMargin::whereMSponsorId($user_id)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue